Restoring Neo4J
Resolving conflicts