try to resolve conflict