resolved conflict + started solveur