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.
If this still does not fix the issue, remove the Node Modules cache with rm -Rf node_modules/.cache