add eclim
merge