update compat

debian/control

@@ -4,7 +4,6 @@ Priority: optional
 Maintainer: Kostya Esmukov <kostya@esmukov.ru>
 Build-Depends: debhelper-compat (= 13),
                dh-python,
-               debhelper (>= 9.20160709) | dh-systemd,
                python3-all,
                python3-click,
                python3-prometheus-client (>= 0.1.0),
@@ -12,14 +11,6 @@ Build-Depends: debhelper-compat (= 13),
                python3-requests,
                python3-serial,
                python3-setuptools
-<<<<<<< HEAD
-Build-Depends-Indep: python3-pytest,
-                     python3-requests,
-                     python3-click,
-                     python3-prometheus-client (>= 0.1.0),
-                     python3-serial
-=======
->>>>>>> upstream/3.1.0
 Standards-Version: 3.9.8
 Homepage: https://github.com/KostyaEsmukov/afancontrol
 
@@ -30,15 +21,10 @@ Depends: hddtemp,
          python3-click,
          python3-pkg-resources,
          python3-prometheus-client (>= 0.1.0),
-<<<<<<< HEAD
-         python3-serial
-Suggests: freeipmi-tools,
-=======
          python3-serial,
          ${misc:Depends},
          ${python3:Depends}
 Suggests: freeipmi-tools
->>>>>>> upstream/3.1.0
 Description: Advanced Fan Control program (Python 3)
  afancontrol is an Advanced Fan Control program, which controls PWM
  fans according to the current temperatures of the system components.