fix borked merge