diff --git a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/SearchAPI.java b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/SearchAPI.java
index d2c55fe1de..edbcf75d40 100644
--- a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/SearchAPI.java
+++ b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/v0/SearchAPI.java
@@ -160,7 +160,6 @@ public class SearchAPI extends BaseAPI
     }
     
     /**
->>>>>>> remotes/origin/feature/RM-6310_securityMarksSearchNotProperlyUpdated_AutomationTests
      * Generic faceted search.
      * @param username
      * @param password