merge result/conflicts et bug fixe