deleted migration that shouldn't have been in the merge