CFY-225 remove conflict leftovers