Remove conflict marker, move entry to its chronological location.