Merge conflict pulled