Weight loss - fix conflicts

resources/views/app/patient/module-specific-summary-renderers/weight_loss_intake/plan.blade.php

@@ -116,9 +116,6 @@
             </table>
         </div>
     </div>
-<<<<<<< HEAD
-@endif
-=======
     @endif
 @endif
->>>>>>> 42ef3117ef8098c432c89c16352248e1f09ce236
+

resources/views/app/patient/module-specific-summary-renderers/weight_loss_intake/subjective.blade.php

@@ -40,10 +40,5 @@
                 </table>
             </div>
         </div>
-<<<<<<< HEAD
-    </div>
-@endif
-=======
     @endif
 @endif
->>>>>>> 42ef3117ef8098c432c89c16352248e1f09ce236