When executing `npm run dev` I encountered the following error
P粉819533564
2023-08-15 22:50:05
<p>C:UserssamyJobssahl_project>npm run dev</p>
<blockquote>
<p>sahl_project@1.0.0 dev
vite</p>
</blockquote>
<p>X [ERROR] Expected string in JSON but found "<<"</p>
<pre class="brush:php;toolbar:false;">../package.json:2:0:
2 │ <<<<<<< HEAD
╵ ~~</pre>
<p>Unable to load configuration file from C:UserssamyJobssahl_projectvite.config.js
Error starting development server:
Error: Build failed with 1 error:
../package.json:2:0: Error: Expected string in JSON but found "<<"</p>
<p>I tried deleting package-lock.json and node_modules folders and executing npm install, but it didn’t work</p>
![[Web front-end] Node.js quick start](https://img.php.cn/upload/course/000/000/067/662b5d34ba7c0227.png)
It can be difficult to determine the specific source of the problem, but there are a few things you can try to resolve it:
git diff --name-only --diff-filter=U --relativeto check for merge conflicts and list the files causing the problem.npm run dev, try runningnpm ci.npm ion the master branch, then runnpm run devto see if the problem persists.node -v.