strange merge conflict fix