trying to resolve conflict