fix conflict

Signed-off-by: Mohammed Abdi <[email protected]>

Author: Mohammed Abdi

frontend/tsconfig.json

@@ -23,9 +23,5 @@
     "skipLibCheck": true
   },
   "include": ["**/*.ts", "**/*.tsx", "**/*.jsx", "**/*.js"],
-<<<<<<< HEAD
-  "exclude": ["node_modules"]
-=======
   "exclude": ["node_modules", "public"]
->>>>>>> e8f212b894877ffb8b1eca4d980409f84d3969b7
 }