Remove eclipse special merging technique