diff --git a/reference/Topic/app.tpp/all.i b/reference/Topic/app.tpp/all.i
index 61305e980..d13920602 100644
--- a/reference/Topic/app.tpp/all.i
+++ b/reference/Topic/app.tpp/all.i
@@ -2,7 +2,16 @@ TOPIC("main_en-us")
 #include "main_en-us.tppi"
 END_TOPIC
 
-TOPIC("page2_en-us")
-#include "page2_en-us.tppi"
+<<<<<<< .mine
+TOPIC("main_en-us")
+#include "main_en-us.tppi"
+END_TOPIC
+
+TOPIC("page2$en-us")
+#include "page2$en-us.tppi"
+=======
+TOPIC("page2_en-us")
+#include "page2_en-us.tppi"
+>>>>>>> .r11549
 END_TOPIC