how to solve the conflicts