Fix merge conflict in eval