add gitignore to gitignore!!
Merge remote branch 'origin/master'