updated eval engine, resolved conflict
removed tmp file