branch merge conflict