fix merge conflict for ceval.c