chore: fix conflict

Author: kellyselden

.mocharc.js

@@ -1,9 +1,5 @@
 'use strict';
 
 module.exports = {
-<<<<<<< HEAD
   spec: ['test/tests.js']
-=======
-  spec: ['test/**/*-test.js']
->>>>>>> 17a5ad0 (v2.2.1...v2.2.2)
 };