after reset
Merge branch 'feature' of https://github.com/thinkoverit/demo into feature