Fixed a merge conflict