diff --git a/manifests/1.3.6/opensearch-1.3.6.yml b/manifests/1.3.6/opensearch-1.3.6.yml
index 8fd5c8e4cb..cd90d31ca1 100644
--- a/manifests/1.3.6/opensearch-1.3.6.yml
+++ b/manifests/1.3.6/opensearch-1.3.6.yml
@@ -87,17 +87,6 @@ components:
     platforms:
       - linux
       - windows
-<<<<<<< HEAD
-  - name: sql
-    repository: https://github.com/opensearch-project/sql.git
-    ref: '2.x'
-    platforms:
-      - linux
-      - windows
-    checks:
-      - gradle:properties:version
-      - gradle:dependencies:opensearch.version: opensearch-sql-plugin
-=======
   - name: k-NN
     repository: https://github.com/opensearch-project/k-NN.git
     ref: '1.3'