assets confliction resolved