diff --git a/app/Views/dashboard_viewAccess.php b/app/Views/dashboard_viewAccess.php
index eedfa03..b4de0fa 100644
--- a/app/Views/dashboard_viewAccess.php
+++ b/app/Views/dashboard_viewAccess.php
@@ -45,17 +45,10 @@ $name = $row['NAME'];
 						}
 						echo "<td>$sampletext</td>"; 
 						echo "<td> 
-<<<<<<< HEAD
 								<span class='badge text-bg-dark'    onclick='print($sampletype, $accessnumber)'><i class='bi bi-printer'></i></span>
 								<span class='badge text-bg-success' onclick='collect($sampletype, $accessnumber)'>Coll.</span>
 								<span class='badge text-bg-warning' onclick='uncollect($sampletype, $accessnumber)'>Un-Coll.</span> 
 								<span class='badge text-bg-primary' onclick='unreceive($sampletype, $accessnumber)'>Un-Rec.</span> 
-=======
-								<button class='badge text-bg-dark'><i class='bi bi-printer'></i></button>
-								<button class='badge text-bg-success' onclick='collect($sampletype, $accessnumber)'>Coll.</button>
-								<button class='badge text-bg-warning' onclick='uncollect($sampletype, $accessnumber)'>Un-Coll.</button> 
-								<button class='badge text-bg-primary' onclick='unreceive($sampletype, $accessnumber)'>Un-Rec.</button> 
->>>>>>> main
 							</td> ";
 						echo "<td id='comment$sampletype'>$comment <i class='bi bi-pencil-square' role='button' onclick='comment($sampletype, $accessnumber, \"$sampletext\", \"$comment\")'></i></td>";
 						echo " </tr>";