remove the useless added by merging

Author: QiongwenXu

main.cc

@@ -378,7 +378,6 @@ bool parse_input(int argc, char* argv[], input_paras &in_para) {
       case 1: in_para.bm = stoi(optarg); break;
       case 2: in_para.bm_from_file = true; break;
       case 3: in_para.bytecode = optarg; break;
-        <<< <<< < HEAD
       case 4: in_para.map = optarg; break;
       case 5: in_para.desc = optarg; break;
       case 6: in_para.w_e = stod(optarg); break;

main.h

@@ -32,7 +32,6 @@ class input_paras {
   double p_inst_operand;
   double p_inst;
   double p_inst_as_nop;
-  int server_port;
   bool disable_prog_eq_cache;
   bool enable_prog_uneq_cache;
   bool is_win;