diff --git a/fedora-live-design_suite.ks b/fedora-live-design_suite.ks
index d88ec98..b453841 100644
--- a/fedora-live-design_suite.ks
+++ b/fedora-live-design_suite.ks
@@ -25,8 +25,14 @@ gthumb
 # Extra wallpapers
 f23-backgrounds-extras-base
 f23-backgrounds-extras-gnome
+<<<<<<< HEAD
 f24-backgrounds-extras-base
 f24-backgrounds-extras-gnome
+=======
+# Temporary disable for testing purpose
+#f24-backgrounds-extras-base
+#f24-backgrounds-extras-gnome
+>>>>>>> d98e0bc... design-suite: temporary disable f24-backgrounds-extras for testing purpose
 
 # removal of unneeded applications
 -gnome-boxes