diff --git a/mozilla/config/liteness.mak b/mozilla/config/liteness.mak
index 827d0324525..ccedf1df6d9 100644
--- a/mozilla/config/liteness.mak
+++ b/mozilla/config/liteness.mak
@@ -166,7 +166,6 @@ MOZ_COMMUNICATOR_ABOUT=1
 MOZ_COMMUNICATOR_CONFIG_JS=1
 MOZ_COPY_ALL_JARS=1
 MOZ_SPELLCHK=1
-<<<<<<< liteness.mak
 !endif
 
 !ifdef MOZ_JAVA
@@ -182,7 +181,4 @@ MOZ_LITENESS_FLAGS=$(MOZ_LITENESS_FLAGS) -DMOZ_SMARTUPDATE
 ### This probably isn't the best place to put this.
 !if defined(MOZ_NGLAYOUT)
 MOZ_LITENESS_FLAGS=$(MOZ_LITENESS_FLAGS) -DMOZ_NGLAYOUT
-=======
-MOZ_CALENDAR=1
->>>>>>> 3.1.16.4
 !endif