removed migration confliction