Sloppy editing after merge