Merge conflict resolved