deleted eclipse stuff
merging again again