diff --git a/include/Mw/String.h b/include/Mw/String.h
index 8ce23d3..2a744d9 100644
--- a/include/Mw/String.h
+++ b/include/Mw/String.h
@@ -42,20 +42,19 @@ MWDECL void MwStringSize(char* out, MwOffset size);
 MWDECL void MwStringTime(char* out, time_t t);
 
 /*!
-<<<<<<< HEAD
  * @brief Prints up to n characters into a bufferMwStringPrintIntoBuffer.
  * @note On compilers that support C99, this uses vsnprintf to safely print into a buffer; on compilers that don't, vsprintf is used.
  * @param out Buffer
  * @param size Max size
  */
 MWDECL void MwStringPrintIntoBuffer(char* out, MwU32 size, const char* fmt, ...);
-=======
+
+/*!
  * @brief Check if the given key is UTF8
  * @param key Input
  * @return whether its utf8
  */
-MWDECL MwBool MwIsKeyUTF8(MwU32 key);
->>>>>>> master
+MWDECL MwBool MwStringIsKeyUTF8(MwU32 key);
 
 #ifdef __cplusplus
 }
diff --git a/src/backend/wayland.c b/src/backend/wayland.c
index 5671f84..804f77b 100644
--- a/src/backend/wayland.c
+++ b/src/backend/wayland.c
@@ -834,7 +834,7 @@ static void keyboard_key(void*		     data,
 				key = MwLLKeyControl;
 				break;
 			default:
-				if(MwIsKeyUTF8(sym)) {
+				if(MwStringIsKeyUTF8(sym)) {
 					key = sym;
 				}
 			}
diff --git a/src/backend/x11.c b/src/backend/x11.c
index 8220575..0371fbc 100644
--- a/src/backend/x11.c
+++ b/src/backend/x11.c
@@ -558,7 +558,7 @@ static void MwLLNextEventImpl(MwLL handle) {
 				strcpy(str, s);
 			}
 
-			if(MwIsKeyUTF8(sym)) {
+			if(MwStringIsKeyUTF8(sym)) {
 				char s = str[0];
 
 				if(ev.xkey.state & (ShiftMask | LockMask) && !(ev.xkey.state & (ControlMask | Mod1Mask))) {
diff --git a/src/string.c b/src/string.c
index fe931ba..8f960b1 100644
--- a/src/string.c
+++ b/src/string.c
@@ -50,7 +50,7 @@ void MwStringPrintIntoBuffer(char* out, MwU32 size, const char* fmt, ...) {
 	va_end(va);
 };
 
-MWDECL MwBool MwIsKeyUTF8(MwU32 key) {
+MWDECL MwBool MwStringIsKeyUTF8(MwU32 key) {
 	unsigned char bytes[sizeof(MwU32)];
 	memcpy(bytes, &key, sizeof(MwU32));
 	int i = 0;
@@ -111,4 +111,3 @@ MWDECL MwBool MwIsKeyUTF8(MwU32 key) {
 
 	return 1;
 }
->>>>>>> master