initial eclipse
remove duplicates
merge conflicts