diff --git a/requirements_dev.txt b/requirements_dev.txt
index 69a03322b1aa316db9e406235e4fe2c39b5282f5..4b288cee88f4231f330c51f70b1cd9c9f9d05389 100644
--- a/requirements_dev.txt
+++ b/requirements_dev.txt
@@ -19,10 +19,5 @@ matplotlib==3.0.2
 PyQt5==5.12
 Pillow==5.4.1
 
-<<<<<<< HEAD
-svgutils==0.3.1
-
-=======
 msgpack==0.6.1
 svgutils==0.3.1
->>>>>>> 19fac96634f312ac3c014c0517fad0c1fe273655