avant_merge
merged ... enfin je crois