diff --git a/templates/repo/wiki/view.tmpl b/templates/repo/wiki/view.tmpl
index 12aca90f409ed..4d279faa34b2a 100644
--- a/templates/repo/wiki/view.tmpl
+++ b/templates/repo/wiki/view.tmpl
@@ -28,12 +28,8 @@
 					</div>
 				</div>
 			</div>
-<<<<<<< HEAD
 			        <!--Hide wiki view clone button-->
-			<div class="ui action small input gt-df gt-ac" style="display: none" id="clone-panel">
-=======
-			<div class="clone-panel ui action small input">
->>>>>>> giteaofficial/main
+			<div class="clone-panel ui action small input" style="display: none">
 				{{template "repo/clone_buttons" .}}
 				{{template "repo/clone_script" .}}
 			</div>