Undo an un-needed merge line.