bad merge resolution caused broken build