fix the conflict with the mock library
Merge pull request #26 from brad/fix_mock_conflict

fix the conflict with the mock library