Correct after git conflicts
update eclipse