diff --git a/apps/portal/src/components/offers/constants.ts b/apps/portal/src/components/offers/constants.ts
index ceb3c3e7..48d9bf48 100644
--- a/apps/portal/src/components/offers/constants.ts
+++ b/apps/portal/src/components/offers/constants.ts
@@ -5,84 +5,10 @@ export const JobTypeLabel = {
   INTERN: 'Internship',
 };
 
-<<<<<<< HEAD
 export const emptyOption = {
   label: '',
   value: '',
 };
-=======
-export const internshipCycleOptions = [
-  {
-    label: 'Summer',
-    value: 'Summer',
-  },
-  {
-    label: 'Winter',
-    value: 'Winter',
-  },
-  {
-    label: 'Spring',
-    value: 'Spring',
-  },
-  {
-    label: 'Fall',
-    value: 'Fall',
-  },
-  {
-    label: 'Full year',
-    value: 'Full year',
-  },
-];
-
-export const yearOptions = [
-  {
-    label: '2021',
-    value: 2021,
-  },
-  {
-    label: '2022',
-    value: 2022,
-  },
-  {
-    label: '2023',
-    value: 2023,
-  },
-  {
-    label: '2024',
-    value: 2024,
-  },
-];
-
-export const educationLevelOptions = Object.entries(
-  EducationBackgroundType,
-).map(([, value]) => ({
-  label: value,
-  value,
-}));
-
-export const educationFieldOptions = [
-  {
-    label: 'Computer Science',
-    value: 'Computer Science',
-  },
-  {
-    label: 'Information Security',
-    value: 'Information Security',
-  },
-  {
-    label: 'Information Systems',
-    value: 'Information Systems',
-  },
-  {
-    label: 'Business Analytics',
-    value: 'Business Analytics',
-  },
-  {
-    label: 'Data Science and Analytics',
-    value: 'Data Science and Analytics',
-  },
-];
->>>>>>> a31230f7 ([offers][feat] Use city typeahead for location field)
 
 export enum FieldError {
   NON_NEGATIVE_NUMBER = 'Please fill in a non-negative number in this field.',
@@ -111,4 +37,4 @@ export const profileDetailTabs = [
     label: ProfileDetailTab.ANALYSIS,
     value: ProfileDetailTab.ANALYSIS,
   },
-];
+];
\ No newline at end of file
diff --git a/apps/portal/src/components/offers/offersSubmission/submissionForm/BackgroundForm.tsx b/apps/portal/src/components/offers/offersSubmission/submissionForm/BackgroundForm.tsx
index 24d2ec86..e8d6cb50 100644
--- a/apps/portal/src/components/offers/offersSubmission/submissionForm/BackgroundForm.tsx
+++ b/apps/portal/src/components/offers/offersSubmission/submissionForm/BackgroundForm.tsx
@@ -2,16 +2,7 @@ import { useFormContext, useWatch } from 'react-hook-form';
 import { JobType } from '@prisma/client';
 import { Collapsible, RadioList } from '@tih/ui';
 
-<<<<<<< HEAD
 import { FieldError } from '~/components/offers/constants';
-=======
-import {
-  educationFieldOptions,
-  educationLevelOptions,
-  emptyOption,
-  FieldError,
-} from '~/components/offers/constants';
->>>>>>> a31230f7 ([offers][feat] Use city typeahead for location field)
 import type { BackgroundPostData } from '~/components/offers/types';
 import CitiesTypeahead from '~/components/shared/CitiesTypeahead';
 import CompaniesTypeahead from '~/components/shared/CompaniesTypeahead';
@@ -264,7 +255,6 @@ function InternshipJobFields() {
           }}
         />
       </div>
-<<<<<<< HEAD
       <FormTextInput
         endAddOn={
           <FormSelect
@@ -290,10 +280,6 @@ function InternshipJobFields() {
       />
       <Collapsible label="Add more details">
         <div className="grid grid-cols-1 gap-6 sm:grid-cols-2">
-=======
-      <Collapsible label="Add more details">
-        <div className="mb-5 grid grid-cols-2 space-x-3">
->>>>>>> a31230f7 ([offers][feat] Use city typeahead for location field)
           <CitiesTypeahead
             label="Location"
             value={{
@@ -310,7 +296,6 @@ function InternshipJobFields() {
                 setValue('background.experiences.0.cityName', '');
               }
             }}
-<<<<<<< HEAD
           />
           <FormTextInput
             errorMessage={experiencesField?.durationInMonths?.message}
@@ -320,8 +305,6 @@ function InternshipJobFields() {
               min: { message: FieldError.NON_NEGATIVE_NUMBER, value: 0 },
               valueAsNumber: true,
             })}
-=======
->>>>>>> a31230f7 ([offers][feat] Use city typeahead for location field)
           />
         </div>
       </Collapsible>
@@ -405,4 +388,4 @@ export default function BackgroundForm() {
       </div>
     </div>
   );
-}
+}
\ No newline at end of file
diff --git a/apps/portal/src/components/offers/offersSubmission/submissionForm/OfferDetailsForm.tsx b/apps/portal/src/components/offers/offersSubmission/submissionForm/OfferDetailsForm.tsx
index 22bef95a..5bd4307b 100644
--- a/apps/portal/src/components/offers/offersSubmission/submissionForm/OfferDetailsForm.tsx
+++ b/apps/portal/src/components/offers/offersSubmission/submissionForm/OfferDetailsForm.tsx
@@ -22,16 +22,7 @@ import {
   defaultFullTimeOfferValues,
   defaultInternshipOfferValues,
 } from '../OffersSubmissionForm';
-<<<<<<< HEAD
 import { FieldError, JobTypeLabel } from '../../constants';
-=======
-import {
-  emptyOption,
-  FieldError,
-  internshipCycleOptions,
-  yearOptions,
-} from '../../constants';
->>>>>>> a31230f7 ([offers][feat] Use city typeahead for location field)
 import FormMonthYearPicker from '../../forms/FormMonthYearPicker';
 import FormSection from '../../forms/FormSection';
 import FormSelect from '../../forms/FormSelect';
@@ -115,7 +106,6 @@ function FullTimeOfferDetailsForm({
             })}
           />
         </div>
-<<<<<<< HEAD
         <div className="grid grid-cols-1 gap-y-4 sm:grid-cols-2 sm:gap-6">
           <CompaniesTypeahead
             required={true}
@@ -127,7 +117,6 @@ function FullTimeOfferDetailsForm({
             onSelect={(option) => {
               if (option) {
                 setValue(`offers.${index}.companyId`, option.value);
-                setValue(`offers.${index}.companyName`, option.label);
               }
             }}
           />
@@ -158,93 +147,6 @@ function FullTimeOfferDetailsForm({
             monthRequired={true}
             yearLabel=""
             {...register(`offers.${index}.monthYearReceived`, {
-=======
-        <FormTextInput
-          errorMessage={offerFields?.offersFullTime?.level?.message}
-          label="Level"
-          placeholder="e.g. L4, Junior"
-          required={true}
-          {...register(`offers.${index}.offersFullTime.level`, {
-            required: FieldError.REQUIRED,
-          })}
-        />
-      </div>
-      <div className="mb-5 flex grid grid-cols-2 space-x-3">
-        <CompaniesTypeahead
-          required={true}
-          value={{
-            id: watchCompanyId,
-            label: watchCompanyName,
-            value: watchCompanyId,
-          }}
-          onSelect={(option) => {
-            if (option) {
-              setValue(`offers.${index}.companyId`, option.value);
-              setValue(`offers.${index}.companyName`, option.label);
-            }
-          }}
-        />
-        <CitiesTypeahead
-          label="Location"
-          required={true}
-          value={{
-            id: watchCityId,
-            label: watchCityName,
-            value: watchCityId,
-          }}
-          onSelect={(option) => {
-            if (option) {
-              setValue(`offers.${index}.cityId`, option.value);
-              setValue(`offers.${index}.cityName`, option.label);
-            } else {
-              setValue(`offers.${index}.cityId`, '');
-              setValue(`offers.${index}.cityName`, '');
-            }
-          }}
-        />
-      </div>
-      <div className="mb-5 flex grid grid-cols-2 items-start space-x-3">
-        <FormMonthYearPicker
-          monthLabel="Date Received"
-          monthRequired={true}
-          yearLabel=""
-          {...register(`offers.${index}.monthYearReceived`, {
-            required: FieldError.REQUIRED,
-          })}
-        />
-      </div>
-      <div className="mb-5">
-        <FormTextInput
-          endAddOn={
-            <FormSelect
-              borderStyle="borderless"
-              defaultValue={Currency.SGD}
-              isLabelHidden={true}
-              label="Currency"
-              options={CURRENCY_OPTIONS}
-              {...register(
-                `offers.${index}.offersFullTime.totalCompensation.currency`,
-                {
-                  required: FieldError.REQUIRED,
-                },
-              )}
-            />
-          }
-          endAddOnType="element"
-          errorMessage={
-            offerFields?.offersFullTime?.totalCompensation?.value?.message
-          }
-          label="Total Compensation (Annual)"
-          placeholder="0"
-          required={true}
-          startAddOn="$"
-          startAddOnType="label"
-          type="number"
-          {...register(
-            `offers.${index}.offersFullTime.totalCompensation.value`,
-            {
-              min: { message: FieldError.NON_NEGATIVE_NUMBER, value: 0 },
->>>>>>> a31230f7 ([offers][feat] Use city typeahead for location field)
               required: FieldError.REQUIRED,
             })}
           />
@@ -472,7 +374,6 @@ function InternshipOfferDetailsForm({
             }}
           />
         </div>
-<<<<<<< HEAD
         <div className="grid grid-cols-1 gap-y-4 sm:grid-cols-2 sm:gap-6">
           <FormSelect
             display="block"
@@ -542,97 +443,6 @@ function InternshipOfferDetailsForm({
         </div>
       </FormSection>
       <FormSection title="Additional Information">
-=======
-        <CitiesTypeahead
-          label="Location"
-          required={true}
-          value={{
-            id: watchCityId,
-            label: watchCityName,
-            value: watchCityId,
-          }}
-          onSelect={(option) => {
-            if (option) {
-              setValue(`offers.${index}.cityId`, option.value);
-              setValue(`offers.${index}.cityName`, option.label);
-            } else {
-              setValue(`offers.${index}.cityId`, '');
-              setValue(`offers.${index}.cityName`, '');
-            }
-          }}
-        />
-      </div>
-      <div className="mb-5 grid grid-cols-2 space-x-3">
-        <FormSelect
-          display="block"
-          errorMessage={offerFields?.offersIntern?.internshipCycle?.message}
-          label="Internship Cycle"
-          options={internshipCycleOptions}
-          placeholder={emptyOption}
-          required={true}
-          {...register(`offers.${index}.offersIntern.internshipCycle`, {
-            required: FieldError.REQUIRED,
-          })}
-        />
-        <FormSelect
-          display="block"
-          errorMessage={offerFields?.offersIntern?.startYear?.message}
-          label="Internship Year"
-          options={yearOptions}
-          placeholder={emptyOption}
-          required={true}
-          {...register(`offers.${index}.offersIntern.startYear`, {
-            required: FieldError.REQUIRED,
-            valueAsNumber: true,
-          })}
-        />
-      </div>
-      <div className="mb-5">
-        <FormMonthYearPicker
-          monthLabel="Date Received"
-          monthRequired={true}
-          yearLabel=""
-          {...register(`offers.${index}.monthYearReceived`, {
-            required: FieldError.REQUIRED,
-          })}
-        />
-      </div>
-      <div className="mb-5">
-        <FormTextInput
-          endAddOn={
-            <FormSelect
-              borderStyle="borderless"
-              defaultValue={Currency.SGD}
-              isLabelHidden={true}
-              label="Currency"
-              options={CURRENCY_OPTIONS}
-              {...register(
-                `offers.${index}.offersIntern.monthlySalary.currency`,
-                {
-                  required: FieldError.REQUIRED,
-                },
-              )}
-            />
-          }
-          endAddOnType="element"
-          errorMessage={
-            offerFields?.offersIntern?.monthlySalary?.value?.message
-          }
-          label="Salary (Monthly)"
-          placeholder="0"
-          required={true}
-          startAddOn="$"
-          startAddOnType="label"
-          type="number"
-          {...register(`offers.${index}.offersIntern.monthlySalary.value`, {
-            min: { message: FieldError.NON_NEGATIVE_NUMBER, value: 0 },
-            required: FieldError.REQUIRED,
-            valueAsNumber: true,
-          })}
-        />
-      </div>
-      <div className="mb-5">
->>>>>>> a31230f7 ([offers][feat] Use city typeahead for location field)
         <FormTextArea
           label="Negotiation Strategy / Interview Performance"
           placeholder="e.g. Did well in the behavioral interview. Used competing offers to negotiate for a higher salary."
@@ -776,4 +586,4 @@ export default function OfferDetailsForm() {
       </Dialog>
     </div>
   );
-}
+}
\ No newline at end of file