Transitions working
solved conflict
errors
merge difficile pour transition