Trying to resolve conflict