Ajout token + resolve conflicts