add last simgrid lib - adrien
minor commit before the merge - adrien
fix conflicts