fix a merge failure