Attempt to resolve conflict