diff --git a/cities.html b/cities.html
index bab3bfab4..538748ee1 100644
--- a/cities.html
+++ b/cities.html
@@ -26,6 +26,11 @@ <h1>Top cities, by population</h1>
     <li>Istanbul (13,854,740)</li>
     <li>Karachi  (12,991,000)</li>
     <li>Mumbai   (12,478,447)</li>
+<<<<<<< HEAD
+    <li>Edson  (8000)</li>
+=======
+    <li>Calgary   (12,478,447)</li>
+>>>>>>> ff2f15e25d575f30ccc3f96d93fab24aac32c662
   </ol>
 
 </body>
diff --git a/foo.bar b/foo.bar
new file mode 100644
index 000000000..e69de29bb