all merges should now work and no commit should be lost