Undo weird merge issues.