resolve event migration conflicts