git pull origin master
git merge origin master
git push origin master
The problem is with the naming of the folders. The file system does not differ between different casing; so even if
Git is able to keep track of the differences, it can’t communicate these difference to the file system.
Change names and try
git pull origin master again. Best solution is to simply not use multiple folders with a conflicting name. Even on case-sensitive file systems, it will only make things more confusing.