diff --git a/project3/Code/main.py b/project3/Code/main.py
index 5847779..8fe767b 100644
--- a/project3/Code/main.py
+++ b/project3/Code/main.py
@@ -216,12 +216,10 @@ def random_forest(self, kCrossValidation = 10):
             predictData = h.get_file(name, fileType='predictData')
         accuracy, precision, recall, f_score = m.knn(predictData, trainData)
         h.calculateMetrics(accuracy, precision, recall, f_score)
-<<<<<<< HEAD
     
-=======
     elif algorithm == 2:
         m.decision_tree()
->>>>>>> master
+    
     elif algorithm == 3:
         print("Enter train File name")
         trainData = h.get_file_bayes(h.get_fileName(), kCrossValidation = 10)
@@ -233,7 +231,6 @@ def random_forest(self, kCrossValidation = 10):
             predictData = h.get_file_bayes(name, fileType='predictData')
         accuracy, precision, recall, f_score = m.bayes_naive(predictData, trainData)
         h.calculateMetrics(accuracy, precision, recall, f_score)
-<<<<<<< HEAD
     
     elif algorithm == 4:
         print("Enter train File name")
@@ -241,9 +238,9 @@ def random_forest(self, kCrossValidation = 10):
         print("Enter test File name")
         predictData = h.get_file_bayes_demo(h.get_fileName(),fileType = 'predictData')
         m.bayes_naive_demo(predictData, trainData)
-=======
-    elif algorithm == 4:
+   
+    elif algorithm == 5:
         m.random_forest()
+    
     else:
         print("\nWrong input")
->>>>>>> master