Fixed a merge failure