CFY-1231 fix merge bug