try how to solve conflict