Changes to merge, eval.h