resolved conflicts

resources/views/app/patient/segment-templates/covid_intake/summary.blade.php

@@ -120,11 +120,7 @@ if (!!@$point->data) {
 }
 
 ?>
-<<<<<<< HEAD
-
-=======
 <div class="p-3 mb-0">
->>>>>>> 5925b99c246767e2b42d50e90872ba77f3e98355
 <div class="events-none form-read-mode">
     <div class="mb-2">
         <label><b>{{ $patient->displayName() }}</b> is a <b>{{$patient->age_in_years }} year(s) </b>