back to reset strategy
Merge branch 'master' of https://github.com/TDC-bob/bobgit
Revert "merge error fixed"

This reverts commit fc43c58feae8d8d919e94a262fb452c0146787e9.
Merge branch 'master' of https://github.com/TDC-bob/bobgit
ready to test