allowed to commit bin/date/.gitkeep
merged conflict

amendが成功した試しが内