url merge conflict