evaluation without exercises
fixing merge