comment out reset
Merge branch 'base_app'
small thing