fixing issues with borked merge