remove migration conflict