fix rebase conflicts

spec/factories/sales_log.rb

@@ -74,7 +74,7 @@ FactoryBot.define do
       deposit { 10_000 }
       cashdis { 1_000 }
       value { 110_000 }
-      grant { 1_000 }
+      grant { 10_000 }
       proplen { 10 }
       pregyrha { 1 }
       pregla { 1 }

spec/models/validations/sales/soft_validations_spec.rb

@@ -329,4 +329,24 @@ RSpec.describe Validations::Sales::SoftValidations do
       expect(record).not_to be_wheelchair_when_not_disabled
     end
   end
+
+  describe "#grant_outside_common_range?" do
+    it "returns true if grant is below 9000" do
+      record.grant = 1_000
+
+      expect(record).to be_grant_outside_common_range
+    end
+
+    it "returns true if grant is above 16000" do
+      record.grant = 100_000
+
+      expect(record).to be_grant_outside_common_range
+    end
+
+    it "returns false if grant is within expected range" do
+      record.grant = 10_000
+
+      expect(record).not_to be_grant_outside_common_range
+    end
+  end
 end