Avancement Oral
Fix conflicts