Conflicts resoled