diff -Nru neutron-fwaas-dashboard-1.5.0/debian/changelog neutron-fwaas-dashboard-1.5.0/debian/changelog
--- neutron-fwaas-dashboard-1.5.0/debian/changelog	2019-05-09 19:32:24.000000000 +0000
+++ neutron-fwaas-dashboard-1.5.0/debian/changelog	2019-05-10 00:59:44.000000000 +0000
@@ -1,16 +1,13 @@
-neutron-fwaas-dashboard (1.5.0-0ubuntu3.1~ubuntu18.04.1~ppa201905091532) bionic; urgency=medium
+neutron-fwaas-dashboard (1.5.0-0ubuntu3.1~ubuntu18.04.1~ppa201905092059) bionic; urgency=medium
 
   * d/gbp.conf: Create stable/rocky branch.
-  * d/control: Add Conflicts for python(3)-neutron-fwaas-dashboard to ensure
-    python-neutron-fwaas-dashboard is not installed at the same time. For
-    other packages we created a common package for common files that
-    python(3)-* packages depend on to avoid this problem, but Conflicts is
-    less invasive for an SRU (LP: #1828293).
-  * d/control: (Build-)Depends on latest horizon version to ensure unit
-    tests are successful (LP: #1806053).
+  * d/control: Add Breaks/Replaces to python3-neutron-fwaas-dashboard to
+    ensure python-neutron-fwaas-dashboard is removed on upgrade (LP: #1828293).
+  * d/control: (Build-)Depends on latest python3-django-horizon and
+    openstack-dashboard to ensure unit tests are successful (LP: #1806053).
   * No-change backport to bionic
 
- -- Corey Bryant <corey.bryant@canonical.com>  Thu, 09 May 2019 15:32:24 -0400
+ -- Corey Bryant <corey.bryant@canonical.com>  Thu, 09 May 2019 20:59:44 -0400
 
 neutron-fwaas-dashboard (1.5.0-0ubuntu3) cosmic; urgency=medium
 
diff -Nru neutron-fwaas-dashboard-1.5.0/debian/control neutron-fwaas-dashboard-1.5.0/debian/control
--- neutron-fwaas-dashboard-1.5.0/debian/control	2018-10-31 18:10:53.000000000 +0000
+++ neutron-fwaas-dashboard-1.5.0/debian/control	2018-10-31 18:10:53.000000000 +0000
@@ -40,8 +40,10 @@
  python3-pbr (>= 2.0.0),
  ${misc:Depends},
  ${python3:Depends},
-Conflicts:
- python-neutron-fwaas-dashboard,
+Breaks:
+ python-neutron-fwaas-dashboard (<< 1.5.0-0ubuntu3),
+Replaces:
+ python-neutron-fwaas-dashboard (<< 1.5.0-0ubuntu3),
 Description: OpenStack Firewall as a Service - dashboard plugin
  Neutron provides an API to dynamically request and configure virtual networks.
  These networks connect "interfaces" from other OpenStack services (such as