diff --git a/mate-settings-daemon.spec b/mate-settings-daemon.spec
index 37270cd..b89a58b 100644
--- a/mate-settings-daemon.spec
+++ b/mate-settings-daemon.spec
@@ -74,6 +74,7 @@ fi
 %posttrans
 /usr/bin/gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || :
 
+<<<<<<< HEAD
 %install
 export MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make DESTDIR=%{buildroot} install
@@ -83,6 +84,9 @@ find %{buildroot} -name '*.a' -exec rm -rf {} ';'
 
 
 %files -f %{po_package}.lang
+=======
+%files %{name}.lang
+>>>>>>> parent of 14c16b8... eek, fix typo
 %doc AUTHORS COPYING README
 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.mate.SettingsDaemon.DateTimeMechanism.conf
 %config(noreplace) %{_sysconfdir}/mateconf/schemas/apps_mate_settings_daemon_housekeeping.schemas