change gitignore
Merge remote-tracking branch 'remotes/origin/master'
Merge remote-tracking branch 'remotes/origin/master'