diff --git a/src/policy/feerate.h b/src/policy/feerate.h
index 7c5660ac8a..88bc392098 100644
--- a/src/policy/feerate.h
+++ b/src/policy/feerate.h
@@ -11,7 +11,7 @@
 
 #include <string>
 
-const std::string CURRENCY_UNIT = "BTC"; // One formatted unit
+const std::string CURRENCY_UNIT = "LTC"; // One formatted unit
 const std::string CURRENCY_ATOM = "sat"; // One indivisible minimum value unit
 
 /* Used to determine type of fee estimation requested */
diff --git a/src/validation.cpp b/src/validation.cpp
index 215b168a7f..9c0ffd44e0 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -52,14 +52,6 @@
 #include <string>
 
 #include <boost/algorithm/string/replace.hpp>
-<<<<<<< HEAD
-=======
-#include <boost/thread.hpp>
-
-#if defined(NDEBUG)
-# error "Litecoin cannot be compiled without assertions."
-#endif
->>>>>>> 5d6decbfe... Litecoin: Branding
 
 #define MICRO 0.000001
 #define MILLI 0.001