Small edits lost because of merge conflicts