re-ajout du .classpath
merge resolved