delete all
push propre 1
fix conflicts