Removed .classpath and .project to resolve merge conflicts