Fixed build break in CommonHelp

src/utils/general/CommonHelp.cpp

@@ -6,8 +6,6 @@
  */
 #include "CommonHelp.h"
 
-<<<<<<< HEAD
-
 void IntersectOutputHelp() {
 	cerr << "\t-wa\t"           << "Write the original entry in A for each overlap." << endl << endl;
 

src/utils/general/CommonHelp.h

@@ -12,6 +12,8 @@
 #include "version.h"
 #include <cstdlib> //for exit
 
+using namespace std;
+
 extern void allToolsCommonHelp();
 extern void IntersectCommonHelp();
 extern void IntersectOutputHelp();