Merge conflict bresolved