Fixed the merge conflict