save conflict

components/landing-page/area-coverage-and-work-units.tsx

@@ -35,11 +35,7 @@ const AreaCoverageWorkUnits = () => {
               <p className="text-base font-bold">Polda Jajaran</p>
             </button>
           </DialogTrigger>
-<<<<<<< HEAD
-          <DialogContent size="md" className="max-h-[90vh] overflow-y-auto flex flex-col  ">
-=======
           <DialogContent size="md" className="max-h-[90vh] overflow-hidden flex flex-col" data-lenis-prevent>
->>>>>>> d7747da00bb99fa3931b64558555cf22f624ccd5
             <DialogHeader className="flex flex-col justify-center">
               <DialogTitle>
                 <p className="text-center">Polda Jajaran</p>