Entity framework ignore migration. Or merge into master then create the migration (i.