trying to resolve confliction