Eclipse merge