Resolution probléme merge