Fixed merge conflict in .classpath. rdlarkins