fix conflict resolution editing errors