Rebase fix

spec/services/bulk_upload/lettings/validator_spec.rb

@@ -114,7 +114,7 @@ RSpec.describe BulkUpload::Lettings::Validator do
 
       context "when uploading a 2022 template for 2023 bulk upload" do
         let(:bulk_upload) { create(:bulk_upload, user:, year: 2023) }
-        let(:log) { build(:lettings_log, :completed, startdate: Time.zone.local(2022, 5, 6)) }
+        let(:log) { build(:lettings_log, :completed, startdate: Time.zone.local(2022, 5, 6), tenancycode: "5") }
 
         context "with no headers" do
           before do

spec/services/bulk_upload/lettings/year2024/row_parser_spec.rb

@@ -182,7 +182,7 @@ RSpec.describe BulkUpload::Lettings::Year2024::RowParser do
 
             field_85: "2",
 
-            field_96: "5",
+            field_96: "11",
             field_97: "2",
             field_98: "31",
             field_100: "3",