Resolved conflict

public/css/style.css

@@ -3606,6 +3606,7 @@ table.v-top th {
 .no-column-wrap td:first-child {
     white-space: nowrap;
 }
+
 .inline-html-container p>br:first-child:last-child,
 .inline-html-container p:empty {
     display: none;

resources/views/app/patient/primary-coverage-view.blade.php

@@ -112,14 +112,21 @@
 								<td class="text-uppercase">{{$cpc->mcr_number ?? '-'}}</td>
 							</tr>
 <<<<<<< HEAD
+<<<<<<< HEAD
 
 =======
+=======
+>>>>>>> c326bea103e55df389135e900a66c81118703d80
 							
 							<tr>
 								<td>Created At</td>
 								<td class="text-uppercase">{{friendly_date_time($cpc->created_at)}}</td>
 							</tr>
+<<<<<<< HEAD
 >>>>>>> 1e891561ad2d6c635fc985b390d5a03298f8111e
+=======
+
+>>>>>>> c326bea103e55df389135e900a66c81118703d80
 						</tbody>
 					</table>
 				</div>