change to eclipse project
merge