solve confit
solve conflict