diff --git a/navar_city/city1houses b/navar_city/city1houses
index 2c5c0627b..586ec8ed5 100644
--- a/navar_city/city1houses
+++ b/navar_city/city1houses
@@ -6,6 +6,10 @@ width 35
 height 27
 msg
 Created:  1993-11-10
+<<<<<<< .mine
+Modified: 2012-04-15 Rick Tanner
+=======
 Modified: 2012-03-20 Rick Tanner
+>>>>>>> .r17952
 endmsg
 end