diff --git a/src/api/mock/index.ts b/src/api/mock/index.ts
index 8ec6ea42..f49791aa 100644
--- a/src/api/mock/index.ts
+++ b/src/api/mock/index.ts
@@ -76,17 +76,15 @@ const mockObject: MockMethod[] = [
     response: () => test.fetchScatterBasic
   },
   {
-<<<<<<< HEAD
     url: mapUrl,
     method: RequestHttpEnum.GET,
     response: () => test.fetchMap
   },
-=======
+  {
     url: wordCloudUrl,
     method: RequestHttpEnum.GET,
     response: () => test.fetchWordCloud
   }
->>>>>>> dev-wordcloud
 ]
 
 export default mockObject