solve conflicts in reset 2 part
Merge pull request #4 from rgg410/feature/testreset

solve conflicts in reset 2 part