diff --git a/test.cpp b/test.cpp
index 24d03c1..f21b31b 100755
--- a/test.cpp
+++ b/test.cpp
@@ -28,31 +28,6 @@ int main() {
 	v.push_back(att3);
 	
 	engine.createTable("Food", v);
-<<<<<<< HEAD
-	
-	vector<string> tuple;
-	tuple.push_back("Omelette");
-	tuple.push_back("Fried Rice");
-	tuple.push_back("Grouper");
-	
-	engine.getTableFromName("Food").insertTuple(tuple);
-	
-	vector<string> old;
-	vector<string> newa;
-	
-	old.push_back("Breakfast");
-	old.push_back("Lunch");
-	old.push_back("Dinner");
-	
-	newa.push_back("Tsafkaerb");
-	newa.push_back("Hcnul");
-	newa.push_back("Rennid");
-	
-	engine.rename(engine.getTableFromName("Food"), old, newa);
-	engine.getTableFromName("Food").display();
-	cout << "finished";
-}
-=======
 
 	Attribute att4("SecondBreakfast", "VARCHAR(20)", true);
 	Attribute att5("SecondLunch", "VARCHAR(20)", false);
@@ -75,12 +50,5 @@ int main() {
 	
 	engine.createTable("MoarFood", v2);
 
-	vector<string> test = engine.getTableFromName("Food").getTuple(1);
-
-	for (int i = 0; i < test.size(); ++i){
-		cout << test[i] << " ";
-	}
-
 	//engine.setUnion(engine.getTableFromName("Food"), engine.getTableFromName("MoarFood")).display();
-}
->>>>>>> beccadev
+}