diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/generate.cmd b/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/generate.cmd
index a4c9a34f9c28..2f40d1ae5ba7 100644
--- a/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/generate.cmd
+++ b/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/generate.cmd
@@ -4,10 +4,4 @@
 ::
 
 @echo off
-<<<<<<< HEAD:src/SDKs/CognitiveServices/dataPlane/Search/EntitySearch/generate.cmd
 call %~dp0..\..\..\..\..\..\tools\generate.cmd cognitiveservices/data-plane/EntitySearch %*
-=======
-call %~dp0..\..\..\..\..\..\tools\generate.cmd cognitiveservices/data-plane/EntitySearch %*
-call %~dp0..\..\..\..\..\..\tools\generate.cmd cognitiveservices/data-plane/VideoSearch %*
-call %~dp0..\..\..\..\..\..\tools\generate.cmd cognitiveservices/data-plane/WebSearch %*
->>>>>>> upstream/psSdkJson6:src/SDKs/CognitiveServices/dataPlane/Search/Search/generate.cmd