Merge conflict error resolved