diff -Nru power-profiles-daemon-0.10.1/debian/changelog power-profiles-daemon-0.10.1/debian/changelog
--- power-profiles-daemon-0.10.1/debian/changelog	2021-11-12 08:46:29.000000000 +0000
+++ power-profiles-daemon-0.10.1/debian/changelog	2022-03-05 17:17:30.000000000 +0000
@@ -1,3 +1,14 @@
+power-profiles-daemon (0.10.1-3) unstable; urgency=medium
+
+  * debian/patches/remove_tlp_conflict.patch:
+    - remove the systemd unit conflict on tlp.service. We don't want that in
+      Ubuntu since we patch tlp to not do performance modes changes when
+      power-profiles-daemon is active but the change can be included in
+      Debian also since the tlp maintainer made the packages conflict
+      which means we can't end up installed together.
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Sat, 05 Mar 2022 18:17:30 +0100
+
 power-profiles-daemon (0.10.1-2) unstable; urgency=medium
 
   * debian/tests: remove for now since changes in the new versions are
diff -Nru power-profiles-daemon-0.10.1/debian/patches/remove_tlp_conflict.patch power-profiles-daemon-0.10.1/debian/patches/remove_tlp_conflict.patch
--- power-profiles-daemon-0.10.1/debian/patches/remove_tlp_conflict.patch	1970-01-01 00:00:00.000000000 +0000
+++ power-profiles-daemon-0.10.1/debian/patches/remove_tlp_conflict.patch	2022-03-05 17:17:30.000000000 +0000
@@ -0,0 +1,18 @@
+Description: remove the systemd unit conflict on tlp.service
+we don't want that in Ubuntu since we patch tlp to not do performance modes
+changes when power-profiles-daemon is active but the change can be
+included in Debian also since the tlp maintainer made the packages conflict
+which means we can't end up installed together
+forwarded: not-needed
+Index: power-profiles-daemon/data/power-profiles-daemon.service.in
+===================================================================
+--- power-profiles-daemon.orig/data/power-profiles-daemon.service.in
++++ power-profiles-daemon/data/power-profiles-daemon.service.in
+@@ -1,6 +1,6 @@
+ [Unit]
+ Description=Power Profiles daemon
+-Conflicts=tuned.service tlp.service auto-cpufreq.service system76-power.service
++Conflicts=tuned.service auto-cpufreq.service system76-power.service
+ Before=multi-user.target display-manager.target
+ 
+ [Service]
diff -Nru power-profiles-daemon-0.10.1/debian/patches/series power-profiles-daemon-0.10.1/debian/patches/series
--- power-profiles-daemon-0.10.1/debian/patches/series	2021-11-12 08:46:29.000000000 +0000
+++ power-profiles-daemon-0.10.1/debian/patches/series	2022-03-05 17:17:30.000000000 +0000
@@ -1 +1,2 @@
 build_older_polkit.patch
+remove_tlp_conflict.patch