solve conflict in project