diff --git a/README.md b/README.md
index 1ad0995..8b542cc 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,3 @@
-<<<<<<< HEAD
-# Python_AI_Projekt
-Projekt för Pythonkurs (AI)
-
-
-Autoencoders
-Scikit-learn: - K-nearest neighbors
-=======
 # Supervised Learning - Movie/TV-Show recommender
 
 ## Specification
@@ -45,7 +37,6 @@ I will use k-Nearest Neighbors (k-NN) alhorithm that can help me find other titl
     
 ### Classes
   1. LoadData
-     * Loading, cleaning and saving alla data to csv
      * check_data
      * clean_text
      * clean_data
@@ -58,5 +49,3 @@ I will use k-Nearest Neighbors (k-NN) alhorithm that can help me find other titl
   3. Recommendations
      * get_recommendations 
 
-
->>>>>>> b992895c329b4c147193b68b17c8181bb17fb220