あ
Merge remote-tracking branch 'origin/master'
Removed file that shouldn't be tracked