Check in .gitignore configuration change
Delete wrong .gitignore
Merge remote-tracking branch 'origin/master'