Re-applying migration in conflict