another try to resolve conflict