committing classpath file
commit after resolving conflict in classpath file