remove not-to-track files (commit: 4294a2f)
restore .classpath files (commit: 2f9f24b)
clean wd (commit: 8565e9e)
merge (commit: 666cf25)