diff --git a/DBEngine.cpp b/DBEngine.cpp
index ca1d681..b216922 100755
--- a/DBEngine.cpp
+++ b/DBEngine.cpp
@@ -217,8 +217,7 @@ Relation DBEngine::setDiff(Relation r1, Relation r2){
 		vector<string> temp;
 		
 		int size = 0;
-		
-<<<<<<< HEAD
+		
 		for(int x = 0; x < r2.getAttributes().size(); ++x)
 		{
 			for (int i = 0; i < r2.getAttributes()[x].getSize(); ++i)
@@ -284,4 +283,12 @@ Relation DBEngine::crossProduct(Relation r1, Relation r2){
 	
 
 	return new_r;
+}
+	
+//UPDATE Senator
+//SET Party = ‘Independent’
+//WHERE Name = ‘Joseph Lieberman’
+
+Relation DBEngine::update(Relation r, string attNameSet, string attSet, string attNameWhere, string attWhere){
+	return r;
 }
diff --git a/DBEngine.h b/DBEngine.h
index c688cb8..4b4eb3b 100755
--- a/DBEngine.h
+++ b/DBEngine.h
@@ -31,11 +31,6 @@ public:
 	Relation setUnion(Relation r1, Relation r2);
 	Relation setDiff(Relation r1, Relation r2);
 	Relation crossProduct(Relation r1, Relation r2);
-	Relation update();
-	
-	//UPDATE Senator
-	//SET Party = ‘Independent’
-	//WHERE Name = ‘Joseph Lieberman’;
-	
+	Relation update(Relation r, string attNameSet, string attSet, string attNameWhere, string attWhere);
 	//Relation deleteCmd();
 };
diff --git a/a.out b/a.out
index a30738a..a6a3015 100755
Binary files a/a.out and b/a.out differ