Undo wrong merge resolution from master.