fix: remove merge conflict marker and close TypeScript analytics test

- Remove '=======' conflict marker at line 948
- Add closing braces for TypeScript analytics test
- Fixes syntax error: Expected ',', got '<eof>'

Author: Shubham Goyal

test/service/templateService.test.ts

@@ -945,7 +945,7 @@ describe('TemplateService', () => {
         'tsconfig.json'
       );
       chai.expect(fs.existsSync(tsconfigPath)).to.be.true;
-=======
+    });
     it('should create Project (agent)', async () => {
       await remove(path.join('testsoutput', 'libraryCreate', 'project'));
       const result = await templateService.create(TemplateType.Project, {