diff --git a/shared-libs/cht-datasource/test/index.spec.ts b/shared-libs/cht-datasource/test/index.spec.ts
index d077d087c48..1ee95acaec5 100644
--- a/shared-libs/cht-datasource/test/index.spec.ts
+++ b/shared-libs/cht-datasource/test/index.spec.ts
@@ -7,6 +7,7 @@ import * as Qualifier from '../src/qualifier';
 import sinon, { SinonStub } from 'sinon';
 import * as Context from '../src/libs/data-context';
 import { DataContext } from '../src';
+import { Page } from '../src/libs/core';
 
 describe('CHT Script API - getDatasource', () => {
   let dataContext: DataContext;
diff --git a/shared-libs/cht-datasource/test/person.spec.ts b/shared-libs/cht-datasource/test/person.spec.ts
index 6a106516db6..e6b5b5922a5 100644
--- a/shared-libs/cht-datasource/test/person.spec.ts
+++ b/shared-libs/cht-datasource/test/person.spec.ts
@@ -184,15 +184,7 @@ describe('person', () => {
         isContactTypeQualifier.returns(true);
         getPage.resolves(people);
 
-<<<<<<< HEAD
-<<<<<<< HEAD
         await expect(Person.v1.getPage(dataContext)(personTypeQualifier, invalidLimit, skip ))
-=======
-        await expect(Person.v1.getPage(dataContext)({ personType: personTypeQualifier, limit: invalidLimit, skip }))
->>>>>>> b988b5782 (Avoid using spread operator in getDocumentStream function)
-=======
-        await expect(Person.v1.getPage(dataContext)(personTypeQualifier, invalidLimit, skip ))
->>>>>>> 90cc4cae2 (Remove limit and skip as arguments for getDocumentStream function)
           .to.be.rejectedWith(`limit must be a positive number`);
 
         expect(assertDataContext.calledOnceWithExactly(dataContext)).to.be.true;