Add more swap files
Handle unique conflicts in neo4j's prior to 1.9