changed to eclipse files
getting rid of merge