git ask me to commit before doing pull.
Finished the merge. Conflicts with the classpath, so I removed it.