diff --git a/12/title.txt b/12/title.txt
index bfbbc57..96c5772 100644
--- a/12/title.txt
+++ b/12/title.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-Kgaolo 13
-=======
-Kgaolo 12
->>>>>>> ed612fa2fa239f6525af066f0557f5e79a94d85f
+Kgaolo 12
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 81f8e28..740c795 100644
--- a/manifest.json
+++ b/manifest.json
@@ -67,14 +67,6 @@
 		"02-12",
 		"02-14",
 		"02-16",
-		"13-title",
-		"13-01",
-		"13-03",
-		"13-05",
-		"13-07",
-		"13-09",
-		"13-11",
-		"13-13",
 		"03-title",
 		"03-01",
 		"03-04",
@@ -132,6 +124,7 @@
 		"11-27",
 		"11-30",
 		"11-32",
+		"12-title",
 		"12-01",
 		"12-03",
 		"12-06",
@@ -140,6 +133,14 @@
 		"12-14",
 		"12-16",
 		"12-19",
-		"12-20"
+		"12-20",
+		"13-title",
+		"13-01",
+		"13-03",
+		"13-05",
+		"13-07",
+		"13-09",
+		"13-11",
+		"13-13"
 	]
 }
\ No newline at end of file