diff --git a/How-to-upgrade.md b/How-to-upgrade.md
index 10880f0..5fd6799 100644
--- a/How-to-upgrade.md
+++ b/How-to-upgrade.md
@@ -40,14 +40,8 @@ Not sure why you need a picture of this, but here it is:
  * If you do not have backups yet, make a backup of `MultiVerse/`.
  * Remove `MultiVerse.jar` and the `MultiVerse/` folder.
 
-<<<<<<< HEAD
 Your plugins folder should look similar to this:   
-_**NOTE**: I have left my MultiVerse folder because it does not hurt anything._
 [[images/upgrade/step5.png]]
-=======
-Your plugins folder should look similar to this:
-[[images/step5.png]]
->>>>>>> 0ee71da2143148f91b86dea6f074bd79354dbb3c
 
 ## Step 6