making the master branch work after merge failed