bad merge conflict fix