solve conflict again