diff --git a/indra/llcommon/llstring.h b/indra/llcommon/llstring.h
index 91b706a5beed161a762f75c17b17319e9cde54d5..813e2656ae2e0db158e19ad97298c72aa87e3525 100644
--- a/indra/llcommon/llstring.h
+++ b/indra/llcommon/llstring.h
@@ -521,7 +521,14 @@ std::string utf8str_removeCRLF(const std::string& utf8str);
  * formatted string.
  *
  */
-int safe_snprintf(char* str, size_t size, const char* format, ...);
+
+// Deal with the differeneces on Windows
+namespace snprintf_hack
+{
+	LL_COMMON_API int snprintf(char *str, size_t size, const char *format, ...);
+}
+
+using snprintf_hack::snprintf;
 
 /**
  * @brief Convert a wide string to std::string
diff --git a/indra/llmessage/CMakeLists.txt b/indra/llmessage/CMakeLists.txt
index 3fa64542556cd123b365cf25cb36675625e57c51..67a171dde6fa4b6d4f10b9a430dfa6fbc342ed1b 100644
--- a/indra/llmessage/CMakeLists.txt
+++ b/indra/llmessage/CMakeLists.txt
@@ -229,12 +229,5 @@ IF (NOT LINUX AND VIEWER)
 	  # llareslistener.cpp
       )
     LL_ADD_PROJECT_UNIT_TESTS(llmessage "${llmessage_TEST_SOURCE_FILES}")
-    
-<<<<<<< local
-    # Commented out - see rationale at bottom of newview's build file + poppy 2009-06-05
-    # Don't make llmessage depend on llsdmessage_test because ADD_COMM_BUILD_TEST depends on llmessage!
-    # ADD_COMM_BUILD_TEST(llsdmessage "" "${CMAKE_CURRENT_SOURCE_DIR}/tests/test_llsdmessage_peer.py")
-#    ADD_BUILD_TEST(llareslistener llmessage)
-=======
->>>>>>> other
+
 ENDIF (NOT LINUX AND VIEWER)