fix bad edit after conflict resolution