remove eclipse files
merge