diff --git a/IMFMessage.cpp b/IMFMessage.cpp
index 53aeb14..440ded2 100644
--- a/IMFMessage.cpp
+++ b/IMFMessage.cpp
@@ -84,8 +84,4 @@ namespace coreutils {
       return ZString();
    }
 
-   void IMFMessage::setBody(PString *body) {
-      this->body = new IMFBody(body);
-   }
-
 }
diff --git a/ZString.h b/ZString.h
index ddd3a38..07f769d 100644
--- a/ZString.h
+++ b/ZString.h
@@ -1,10 +1,3 @@
-<<<<<<< HEAD
-#ifndef __ZString_h__
-#define __ZString_h__
-
-#include "includes"`
-=======
-
 #ifndef __ZString_h__
 #define __ZString_h__
 
@@ -13,15 +6,10 @@
 #include <ostream>
 #include <vector>
 #include <stack>
->>>>>>> develop
 
 namespace coreutils {
 
    ///
-<<<<<<< HEAD
-   /// ZString provides a data pointer and a length to basically point to a string
-   /// from a common backstore. 
-=======
    /// Use the ZString object when advanced parsing algorithms are required to simplify
    /// parsing. ZString is not a backing store and requires that any referenced buffer
    /// or objects are retained throughout the life of the object. Additionally, ZString
@@ -41,44 +29,11 @@ namespace coreutils {
    ///
    /// You can stream the ZString to an output stream using the << operator and the entire
    /// contents of the ZString will be output regardless of parsing activity. 
->>>>>>> develop
    ///
 
    class ZString {
 
     public:
-<<<<<<< HEAD
-      ZString() {}
-      ZString(char *data) {
-         this->data = data;
-         length = strlen(data);
-      }
-
-      ZString(char *data, size_t length) {
-         this->data = data;
-         this->length = length;
-      }
-
-      std::string asString() {
-         return std::string(data, length);
-      }
-
-      void setString(char *data, size_t length) {
-         this->data = data;
-         this->length = length;
-      }
-
-    private:
-      char *data;
-      size_t length;
-
-   };
-
-
-}
-
-#endif
-=======
 
       ///
       /// Consructor providing an empty ZString.
@@ -349,4 +304,3 @@ namespace coreutils {
 }
 
 #endif
->>>>>>> develop