Merge with eclipse