working on evaluation
fixed conflict