Joseph Pollack
adds Neo4j, removes conflict markers
8095967 unverified