Undo weird merge stuff