hoge
hoge
gitignore
fixed conflicts
.gitignore
delete