CFY-1155 fix merge problem