diff --git a/control b/control
index 01749fd..fc0abc7 100644
--- a/control
+++ b/control
@@ -4,10 +4,6 @@ Section: graphics
 Priority: optional
 Architecture: all
 Installed-size: 27000
-<<<<<<< HEAD
-Depends: bash, python, libc
-=======
-Depends: bash, python, python-imaging
->>>>>>> 783687aeb3bb92c515f31f44b919bb0102d64d2f
+Depends: bash, python, python-imaging, libc
 Maintainer: skycooler@gmail.com
 Description: Lightningbeam is an open-source animated content creation tool.