correction bug de merge