change .gitignore
Add user following
Merge remote branch 'origin/master'