added eclim
fixed conflict