afterreset
Merge branch 'master' of https://github.com/am1tanaka/rebasetest