Fix borked merge commit