Merge conflict marker encountered

For anyone coming from Google, I had a similar issue in React, but I was 100% confident that I had already resolved all conflicts.

I fixed it by switching to another branch, then switching back to the original.

For those coming from Google that:

• had the error with React
• are 100% confident they have already resolved all conflict
• user-124812948 's answer did not work

I fixed it by deleting node_modules cache: rm -Rf node_modules/.cache

Here is the link to an article that explains what's happening

while you're merging master into your local feature branch there are some conflicts, you need to resolve them by accepting the current or incoming changes. Open those files and remove these <<<<<<< HEAD >>>>>>> master and commit your changes. If you've Visual Studio Code will clearly show you the conflicts.

Files that had conflict marker:

app/example/example.module.ts:9:1 // in this file line number 9 should've conflict marker **>>>>>**app/app.module.ts:54:1 // in this file line number 54 should've conflict marker **>>>>>**app/app.module.ts:56:1 // in this file line number 56 should've conflict marker **>>>>>**

Once you resolved the conflicts and still getting the error, the filesmight have been cached, try to switching to another branch, thenswitching back to the original.

Still Webpack isn't noticing your file changes - https://dev.to/pnevares/webpack-isn-t-noticing-your-file-changes-did-you-do-something-wrong-34dc