Resolved the merge conflict