Выдает ошибку при pull origin и gitignore не игнорирует pycache?

Question

[vovashaplin]

Пишет
error: The following untracked working tree files would be overwritten by merge:
frontend/node_modules/.bin/acorn.ps1
frontend/node_modules/.bin/ansi-html.ps1
frontend/node_modules/.bin/atob.ps1
frontend/node_modules/.bin/browserslist.ps1
frontend/node_modules/.bin/cross-env-shell.ps1
...........................
сижу на Github Desktop

Вот gitignore

# dependencies
node_modules/
static/
/.pnp
.pnp.js

# testing
/coverage

# production
/build

# misc
.DS_Store
.env.local
.env.development.local
.env.test.local
.env.production.local

npm-debug.log*
yarn-debug.log*
yarn-error.log*

# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
*$py.class

# production
/build