Fixed a merge conflict on merge.