- Fixed a merge issue