Fix borked merge.