Merge with Eclipse