recommit for solve conflict