fix the borked merge