diff --git a/assignment-client/src/metavoxels/MetavoxelServer.cpp b/assignment-client/src/metavoxels/MetavoxelServer.cpp
index d50ca963eb..fa60d3a88c 100644
--- a/assignment-client/src/metavoxels/MetavoxelServer.cpp
+++ b/assignment-client/src/metavoxels/MetavoxelServer.cpp
@@ -88,7 +88,7 @@ void MetavoxelServer::sendDeltas() {
 
 MetavoxelSession::MetavoxelSession(MetavoxelServer* server, const SharedNodePointer& node) :
     _server(server),
-    _sequencer(byteArrayWithPopluatedHeader(PacketTypeMetavoxelData)),
+    _sequencer(byteArrayWithPopulatedHeader(PacketTypeMetavoxelData)),
     _node(node) {
     
     connect(&_sequencer, SIGNAL(readyToWrite(const QByteArray&)), SLOT(sendData(const QByteArray&)));
diff --git a/interface/src/MetavoxelSystem.cpp b/interface/src/MetavoxelSystem.cpp
index a14e133bc1..0421ca4747 100644
--- a/interface/src/MetavoxelSystem.cpp
+++ b/interface/src/MetavoxelSystem.cpp
@@ -168,19 +168,12 @@ bool MetavoxelSystem::SimulateVisitor::visit(MetavoxelInfo& info) {
     return false;
 }
 
-<<<<<<< HEAD
 MetavoxelSystem::RenderVisitor::RenderVisitor() :
     SpannerVisitor(QVector<AttributePointer>() << AttributeRegistry::getInstance()->getSpannersAttribute()) {
 }
 
 void MetavoxelSystem::RenderVisitor::visit(Spanner* spanner) {
     spanner->getRenderer()->render(1.0f);
-=======
-static QByteArray createDatagramHeader(const QUuid& sessionID) {
-    QByteArray header = byteArrayWithPopulatedHeader(PacketTypeMetavoxelData);
-    header += sessionID.toRfc4122();
-    return header;
->>>>>>> 224f42c366bedfe91546888a9039c917ff6d416c
 }
 
 MetavoxelClient::MetavoxelClient(const SharedNodePointer& node) :