diff --git a/gen_input/templates/tcc/CORENAME.cpp.gtl b/gen_input/templates/tcc/CORENAME.cpp.gtl
index 9cf1cab..ee4ec9a 100644
--- a/gen_input/templates/tcc/CORENAME.cpp.gtl
+++ b/gen_input/templates/tcc/CORENAME.cpp.gtl
@@ -159,22 +159,13 @@ if(fcsr != null) {%>
         } 
     }
     value NaNBox64(tu_builder& tu, value NaNBox64_val){
-<<<<<<< HEAD
-        throw new std::runtime_error("tcc does not support Registers wider than 64 bits");
-        /*if(static_cast<uint32_t>(traits::FLEN) == 64)
-=======
         if(static_cast<uint32_t>(traits::FLEN) == 64)
->>>>>>> 879e44b (corrects tcc template when using floating point)
             return tu.ext(NaNBox64_val, traits::FLEN, false);
         else {
             throw new std::runtime_error("tcc does not support Registers wider than 64 bits");     
             auto box = tu.assignment(tu.logical_neg((tu.ext(0, 128, false))), traits::FLEN) ;
             return tu.ext((tu.bitwise_or(tu.shl(box, 64), NaNBox64_val)), traits::FLEN, false);
-<<<<<<< HEAD
-        }*/
-=======
         }
->>>>>>> 879e44b (corrects tcc template when using floating point)
     }
 <%}%>
 private: