Fixed a merge issue