diff --git a/api-docs/apiLive.htm b/api-docs/apiLive.htm
index 19798119a..59ac1f202 100644
--- a/api-docs/apiLive.htm
+++ b/api-docs/apiLive.htm
@@ -4064,7 +4064,6 @@
 				</div>
 			</div>
 
->>>>>>> update api docs format
 		</div>
 		<!-- main-content-wrapper -->