diff --git a/mopidy_touchscreen/dynamic_background.py b/mopidy_touchscreen/dynamic_background.py
index 0c031b2..469bb33 100644
--- a/mopidy_touchscreen/dynamic_background.py
+++ b/mopidy_touchscreen/dynamic_background.py
@@ -1,9 +1,13 @@
 import random
 
+<<<<<<< HEAD
 change_speed = 2
 
 import pygame
 
+=======
+import pygame
+>>>>>>> d49db26693cc07087bc620dcdc603290ef56557b
 
 class DynamicBackground():
     def __init__(self, size):
diff --git a/mopidy_touchscreen/screen_manager.py b/mopidy_touchscreen/screen_manager.py
index 69d9ddf..c215b17 100644
--- a/mopidy_touchscreen/screen_manager.py
+++ b/mopidy_touchscreen/screen_manager.py
@@ -29,7 +29,6 @@ class ScreenManager():
         self.core = core
         self.cache = cache
         self.fonts = {}
-        self.background = DynamicBackground(size)
         self.current_screen = library_index
         self.init_manager(size)