Fixed a merge problem