# Conflicts: # app/helpers/bulk_upload/sales_log_to_csv.rb # app/services/bulk_upload/sales/year2026/csv_parser.rb # app/services/bulk_upload/sales/year2026/row_parser.rb # db/schema.rb # spec/fixtures/files/2026_27_sales_bulk_upload.csv # spec/fixtures/files/sales_logs_csv_export_codes_26.csv # spec/fixtures/files/sales_logs_csv_export_labels_26.csv # spec/fixtures/files/sales_logs_csv_export_non_support_codes_26.csv # spec/fixtures/files/sales_logs_csv_export_non_support_labels_26.csv # spec/fixtures/variable_definitions/sales_download_26_27.csv # spec/lib/tasks/log_variable_definitions_spec.rb # spec/services/bulk_upload/sales/year2026/row_parser_spec.rb