Avancemen lvl1 + papillon
fix conflicts