I am having this issues when im merging:

git pull origin dev

but IDK how to deal with others.

CodePudding user response：

The other two files are pycache folders which you generally don't need. So unless for some reason you need them (which is unlikely), I would just delete those files and your conflicts should then be resolved after committing