Fixed a merge conflict that I missed