Resolved Conflicts: models/migrations/migrations.go models/migrations/v1_19/v236.go new file: v237.go