migration conflict solved