Fix messy conflict annotations.