Fixed a merge