Resolvig all conflicts