solve a confilcts