Merge ~nteodosio/update-manager:bionic-ua into update-manager:main

[Nathan Teodosio]

Fix incorrect available version for Ubuntu Pro updates in unattached case.

Unmerged commits

6b9d547... by Nathan Teodosio on 2023-11-15

Fix incorrect available version for Ubuntu Pro updates in unattached case.

LP:2043425

bbfcf43... by Sebastien Bacher on 2023-10-06

releasing package update-manager version 1:18.04.11.20

eee5914... by Sebastien Bacher on 2023-10-06

* Ubuntu Pro (LP: #1990450):
  - fix another linter error which was created while fixing a missing
    space in the previous upload...

1d8622b... by Sebastien Bacher on 2023-10-05

releasing package update-manager version 1:18.04.11.19

6b72f19... by Nathan Teodosio on 2023-10-05

Prepare changelog for 1:18.04.11.19.

aefbc17... by Nathan Teodosio on 2023-10-04

Fix linter errors in autopkgtest.

8e1fb1c... by Nathan Teodosio on 2023-08-29

Remove leftover debugging statement.

4c84d5f... by Nathan Teodosio on 2023-08-29

Update changelog.

3f283b8... by Nathan Teodosio on 2023-08-29

Add SoftwarePropertiesPage enumeration-class.

6f33dc2... by Nathan Teodosio on 2023-08-29

Reset UpdateManagerVersion.py to bzr.

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..0370a5e
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+tags
+__pycache__
diff --git a/HweSupportStatus/consts.py b/HweSupportStatus/consts.py
index 433b5b5..9dd7c56 100644
--- a/HweSupportStatus/consts.py
+++ b/HweSupportStatus/consts.py
@@ -6,6 +6,7 @@ from gettext import gettext as _
 
 
 # the day on which the short support HWE stack goes EoL
+<<<<<<< HweSupportStatus/consts.py
 HWE_EOL_DATE = datetime.date(2027, 4, 30)
 
 # the day on which the next LTS first point release is available
@@ -14,6 +15,16 @@ NEXT_LTS_DOT1_DATE = datetime.date(2024, 7, 15)
 
 # end of the month in which this LTS goes EoL
 LTS_EOL_DATE = datetime.date(2027, 4, 30)
+=======
+HWE_EOL_DATE = datetime.date(2023, 4, 30)
+
+# the day on which the next LTS first point release is available
+# used to propose a release upgrade
+NEXT_LTS_DOT1_DATE = datetime.date(2020, 7, 21)
+
+# end of the month in which this LTS goes EoL
+LTS_EOL_DATE = datetime.date(2023, 4, 30)
+>>>>>>> HweSupportStatus/consts.py
 
 
 class Messages:
@@ -33,7 +44,11 @@ in the Dash.
         """
 To upgrade to a supported (or longer-supported) configuration:
 
+<<<<<<< HweSupportStatus/consts.py
 * Upgrade from Ubuntu 20.04 LTS to Ubuntu 22.04 LTS by running:
+=======
+* Upgrade from Ubuntu 16.04 LTS to Ubuntu 18.04 LTS by running:
+>>>>>>> HweSupportStatus/consts.py
 sudo do-release-upgrade %s
 
 OR
@@ -69,6 +84,7 @@ on %s.  After this date security updates for critical parts (kernel
 and graphics stack) of your system will no longer be available.
 
 For more information, please see:
+<<<<<<< HweSupportStatus/consts.py
 http://wiki.ubuntu.com/2204_HWE_EOL
 """
         )
@@ -85,3 +101,13 @@ Stack ended on %s:
         )
         % HWE_EOL_DATE.isoformat()
     )
+=======
+http://wiki.ubuntu.com/1604_HWE_EOL
+""") % HWE_EOL_DATE.isoformat()
+
+    HWE_SUPPORT_HAS_ENDED = _("""
+WARNING: Security updates for your current Hardware Enablement
+Stack ended on %s:
+ * http://wiki.ubuntu.com/1604_HWE_EOL
+""") % HWE_EOL_DATE.isoformat()
+>>>>>>> HweSupportStatus/consts.py
diff --git a/UpdateManager/Core/MetaRelease.py b/UpdateManager/Core/MetaRelease.py
index 9a485c4..ce90be0 100644
--- a/UpdateManager/Core/MetaRelease.py
+++ b/UpdateManager/Core/MetaRelease.py
@@ -155,13 +155,20 @@ class MetaReleaseCore(object):
                 return
             # now check which specific url to use
             if parser.has_option("DEFAULT", "Prompt"):
+<<<<<<< UpdateManager/Core/MetaRelease.py
                 prompt = parser.get("DEFAULT", "Prompt").lower()
                 if prompt == "never" or prompt == "no":
                     self.prompt = "never"
+=======
+                type = parser.get("DEFAULT", "Prompt").lower()
+                if (type == "never" or type == "no"):
+                    self.prompt = 'never'
+>>>>>>> UpdateManager/Core/MetaRelease.py
                     # nothing to do for this object
                     # FIXME: what about no longer supported?
                     self.downloaded.set()
                     return
+<<<<<<< UpdateManager/Core/MetaRelease.py
                 elif prompt == "lts":
                     self.prompt = "lts"
                     # the Prompt=lts setting only makes sense when running on
@@ -174,6 +181,13 @@ class MetaReleaseCore(object):
                         self._debug("Prompt=lts for non-LTS, ignoring")
                 else:
                     self.prompt = "normal"
+=======
+                elif type == "lts":
+                    self.prompt = 'lts'
+                    self.METARELEASE_URI = self.METARELEASE_URI_LTS
+                else:
+                    self.prompt = 'normal'
+>>>>>>> UpdateManager/Core/MetaRelease.py
         # needed for the _tryUpgradeSelf() code in DistUpgradeController
         if forceLTS:
             self.METARELEASE_URI = self.METARELEASE_URI_LTS
diff --git a/UpdateManager/Core/MyCache.py b/UpdateManager/Core/MyCache.py
index e29333c..770fe66 100644
--- a/UpdateManager/Core/MyCache.py
+++ b/UpdateManager/Core/MyCache.py
@@ -481,6 +481,7 @@ class MyCache(DistUpgrade.DistUpgradeCache.MyCache):
         "get the changelog file from the changelog location"
         origins = self[name].candidate.origins
         version = self.pro_versions.get(name, self[name].candidate.version)
+<<<<<<< UpdateManager/Core/MyCache.py
         self.all_changes[name] = _(
             "Changes for %s versions:\n"
             "Installed version: %s\n"
@@ -490,6 +491,12 @@ class MyCache(DistUpgrade.DistUpgradeCache.MyCache):
             getattr(self[name].installed, "version", None),
             version,
         )
+=======
+        self.all_changes[name] = _("Changes for %s versions:\n"
+                                   "Installed version: %s\n"
+                                   "Available version: %s\n\n") % \
+            (name, getattr(self[name].installed, "version", None), version)
+>>>>>>> UpdateManager/Core/MyCache.py
         if self.CHANGELOG_ORIGIN not in [o.origin for o in origins]:
             self._fetch_changelog_for_third_party_package(name, origins)
             return
diff --git a/UpdateManager/Core/UpdateList.py b/UpdateManager/Core/UpdateList.py
index 265ab90..ec5d103 100644
--- a/UpdateManager/Core/UpdateList.py
+++ b/UpdateManager/Core/UpdateList.py
@@ -43,7 +43,11 @@ from gi.repository import Gio
 from UpdateManager.Core import utils
 
 
+<<<<<<< UpdateManager/Core/UpdateList.py
 class UpdateItem:
+=======
+class UpdateItem():
+>>>>>>> UpdateManager/Core/UpdateList.py
     def __init__(self, pkg, name, icon, to_remove, sensitive=True):
         self.icon = icon
         self.name = name
@@ -76,6 +80,7 @@ class UpdateGroup(UpdateItem):
         all_items.extend(self._items)
         return sorted(all_items, key=lambda a: a.name.lower())
 
+<<<<<<< UpdateManager/Core/UpdateList.py
     def add(
         self,
         pkg,
@@ -84,6 +89,10 @@ class UpdateGroup(UpdateItem):
         to_remove=False,
         sensitive=True,
     ):
+=======
+    def add(self, pkg, cache=None, eventloop_callback=None, to_remove=False,
+            sensitive=True):
+>>>>>>> UpdateManager/Core/UpdateList.py
         name = utils.get_package_label(pkg)
         icon = Gio.ThemedIcon.new("package")
         self._items.add(UpdateItem(pkg, name, icon, to_remove, sensitive))
@@ -168,18 +177,28 @@ class UpdateApplicationGroup(UpdateGroup):
     def __init__(self, pkg, application, to_remove, sensitive=True):
         name = application.get_display_name()
         icon = application.get_icon()
+<<<<<<< UpdateManager/Core/UpdateList.py
         super(UpdateApplicationGroup, self).__init__(
             pkg, name, icon, to_remove, sensitive
         )
+=======
+        super(UpdateApplicationGroup, self).__init__(pkg, name, icon,
+                                                     to_remove, sensitive)
+>>>>>>> UpdateManager/Core/UpdateList.py
 
 
 class UpdatePackageGroup(UpdateGroup):
     def __init__(self, pkg, to_remove, sensitive=True):
         name = utils.get_package_label(pkg)
         icon = Gio.ThemedIcon.new("package")
+<<<<<<< UpdateManager/Core/UpdateList.py
         super(UpdatePackageGroup, self).__init__(
             pkg, name, icon, to_remove, sensitive
         )
+=======
+        super(UpdatePackageGroup, self).__init__(pkg, name, icon, to_remove,
+                                                 sensitive)
+>>>>>>> UpdateManager/Core/UpdateList.py
 
 
 class UpdateSystemGroup(UpdateGroup):
@@ -188,9 +207,14 @@ class UpdateSystemGroup(UpdateGroup):
         # the core components and packages.
         name = _("%s base") % utils.get_ubuntu_flavor_name(cache=cache)
         icon = Gio.ThemedIcon.new("distributor-logo")
+<<<<<<< UpdateManager/Core/UpdateList.py
         super(UpdateSystemGroup, self).__init__(
             None, name, icon, to_remove, sensitive
         )
+=======
+        super(UpdateSystemGroup, self).__init__(None, name, icon, to_remove,
+                                                sensitive)
+>>>>>>> UpdateManager/Core/UpdateList.py
 
 
 class UpdateOrigin:
@@ -233,7 +257,10 @@ class UpdateList:
         self.update_groups = []
         self.security_groups = []
         self.kernel_autoremove_groups = []
+<<<<<<< UpdateManager/Core/UpdateList.py
         self.duplicate_groups = []
+=======
+>>>>>>> UpdateManager/Core/UpdateList.py
         self.ubuntu_pro_groups = []
         self.ubuntu_pro_fake_groups = []
         self.num_updates = 0
@@ -424,6 +451,46 @@ class UpdateList:
                 return True
         return False
 
+<<<<<<< UpdateManager/Core/UpdateList.py
+=======
+    def _get_linux_packages(self):
+        "Return all binary packages made by the linux-meta source package"
+        # Hard code this rather than generate from source info in cache because
+        # that might only be available if we have deb-src lines.  I think we
+        # could also generate it by iterating over all the binary package info
+        # we have, but that is costly.  These don't change often.
+        return ['linux',
+                'linux-cloud-tools-generic',
+                'linux-cloud-tools-lowlatency',
+                'linux-cloud-tools-virtual',
+                'linux-crashdump',
+                'linux-generic',
+                'linux-generic-lpae',
+                'linux-headers-generic',
+                'linux-headers-generic-lpae',
+                'linux-headers-lowlatency',
+                'linux-headers-lowlatency-lpae',
+                'linux-headers-server',
+                'linux-headers-virtual',
+                'linux-image',
+                'linux-image-extra-virtual',
+                'linux-image-generic',
+                'linux-image-generic-lpae',
+                'linux-image-lowlatency',
+                'linux-image-virtual',
+                'linux-lowlatency',
+                'linux-signed-generic',
+                'linux-signed-image-generic',
+                'linux-signed-image-lowlatency',
+                'linux-signed-lowlatency',
+                'linux-source',
+                'linux-tools-generic',
+                'linux-tools-generic-lpae',
+                'linux-tools-lowlatency',
+                'linux-tools-virtual',
+                'linux-virtual']
+
+>>>>>>> UpdateManager/Core/UpdateList.py
     def _make_groups(self, cache, pkgs, eventloop_callback, to_remove=False,
                      sensitive=True):
         if not pkgs:
@@ -435,9 +502,14 @@ class UpdateList:
         for pkg in pkgs:
             app = self._get_application_for_package(pkg)
             if app is not None:
+<<<<<<< UpdateManager/Core/UpdateList.py
                 app_group = UpdateApplicationGroup(
                     pkg, app, to_remove, sensitive
                 )
+=======
+                app_group = UpdateApplicationGroup(pkg, app, to_remove,
+                                                   sensitive)
+>>>>>>> UpdateManager/Core/UpdateList.py
                 app_groups.append(app_group)
             else:
                 ungrouped_pkgs.append(pkg)
@@ -458,6 +530,7 @@ class UpdateList:
         if ungrouped_pkgs:
             # Separate out system base packages. If we have already found an
             # application for all updates, don't bother.
+<<<<<<< UpdateManager/Core/UpdateList.py
             linux_names = (
                 "linux$",
                 "linux-.*-buildinfo.*",
@@ -482,6 +555,9 @@ class UpdateList:
             ubuntu_base_group = UpdateGroup(
                 None, None, None, to_remove, sensitive
             )
+=======
+            meta_group = UpdateGroup(None, None, None, to_remove, sensitive)
+>>>>>>> UpdateManager/Core/UpdateList.py
             flavor_package = utils.get_ubuntu_flavor_package(cache=cache)
             ubuntu_base_pkgs = [
                 flavor_package,
@@ -502,6 +578,7 @@ class UpdateList:
                     pkg, cache, eventloop_callback
                 ):
                     if system_group is None:
+<<<<<<< UpdateManager/Core/UpdateList.py
                         system_group = UpdateSystemGroup(
                             cache, to_remove, sensitive
                         )
@@ -509,6 +586,14 @@ class UpdateList:
                 else:
                     pkg_groups.append(
                         UpdatePackageGroup(pkg, to_remove, sensitive)
+=======
+                        system_group = UpdateSystemGroup(cache, to_remove,
+                                                         sensitive)
+                    system_group.add(pkg)
+                else:
+                    pkg_groups.append(UpdatePackageGroup(
+                        pkg, to_remove, sensitive)
+>>>>>>> UpdateManager/Core/UpdateList.py
                     )
 
         app_groups.sort(key=lambda a: a.name.lower())
@@ -518,6 +603,7 @@ class UpdateList:
 
         return app_groups + pkg_groups
 
+<<<<<<< UpdateManager/Core/UpdateList.py
     def update(
         self,
         cache,
@@ -525,12 +611,18 @@ class UpdateList:
         duplicate_packages=[],
         ua_security_packages=[],
     ):
+=======
+    def update(self, cache, eventloop_callback=None, ua_security_packages=[]):
+>>>>>>> UpdateManager/Core/UpdateList.py
         self.held_back = []
 
         # do the upgrade
         self.distUpgradeWouldDelete = cache.saveDistUpgrade()
 
+<<<<<<< UpdateManager/Core/UpdateList.py
         oem_pkgs = []
+=======
+>>>>>>> UpdateManager/Core/UpdateList.py
         pro_pkgs = []
         security_pkgs = []
         upgrade_pkgs = []
@@ -579,6 +671,45 @@ class UpdateList:
                     FakeUbuntuProPackage(package_name, version, size)
                 )
 
+        class FakeUbuntuProPackageCandidate:
+            def __init__(self, source_name, version, size):
+                self.source_name = source_name
+                self.summary = source_name
+                self.description = source_name
+                self.version = version
+                self.size = size
+                self.downloadable = False
+                self.record = {}
+
+        class FakeUbuntuProPackage:
+            def __init__(self, package_name, version, size):
+                self.name = package_name
+                self.candidate = FakeUbuntuProPackageCandidate(package_name,
+                                                               version, size)
+                self.marked_install = False
+                self.marked_upgrade = False
+                self.marked_delete = False
+                self.installed_files = []
+
+            def mark_install(self):
+                pass
+
+            def mark_delete(self):
+                pass
+        fake_ua_packages = []
+        ua_packages_names = []
+        for (
+            package_name,
+            version,
+            size,
+            downloadable
+        ) in ua_security_packages:
+            if downloadable:
+                ua_packages_names.append(package_name)
+            else:
+                fake_ua_packages.append(FakeUbuntuProPackage(package_name,
+                                                             version, size))
+
         # Find all upgradable packages
         for pkg in cache:
             if pkg.is_upgradable or pkg.marked_install:
@@ -600,8 +731,11 @@ class UpdateList:
                         self.ignored_phased_updates.append(pkg)
                         continue
 
+<<<<<<< UpdateManager/Core/UpdateList.py
                 if fnmatch.fnmatch(pkg.name, "oem-*-meta"):
                     oem_pkgs.append(pkg)
+=======
+>>>>>>> UpdateManager/Core/UpdateList.py
                 comes_from_pro = pkg.name in ua_packages_names
                 if comes_from_pro:
                     pro_pkgs.append(pkg)
@@ -622,20 +756,27 @@ class UpdateList:
                 and not cache.running_kernel_pkgs_regexp.match(pkg.name)
             ):
                 kernel_autoremove_pkgs.append(pkg)
+<<<<<<< UpdateManager/Core/UpdateList.py
             if pkg.name in duplicate_packages:
                 duplicate_pkgs.append(pkg)
+=======
+>>>>>>> UpdateManager/Core/UpdateList.py
 
         # perform operations after the loop to not skip packages which
         # changed state due to the resolver
         for pkg in kernel_autoremove_pkgs:
             pkg.mark_delete()
+<<<<<<< UpdateManager/Core/UpdateList.py
         for pkg in duplicate_pkgs:
             pkg.mark_delete()
+=======
+>>>>>>> UpdateManager/Core/UpdateList.py
         for pkg in self.ignored_phased_updates:
             pkg.mark_keep()
 
         if security_pkgs or upgrade_pkgs or pro_pkgs:
             # There's updates available. Initiate the desktop file cache.
+<<<<<<< UpdateManager/Core/UpdateList.py
             pkg_names = [
                 p.name
                 for p in security_pkgs
@@ -644,6 +785,13 @@ class UpdateList:
                 + duplicate_pkgs
                 + pro_pkgs
             ]
+=======
+            pkg_names = [p.name for p in
+                         pro_pkgs
+                         + security_pkgs
+                         + upgrade_pkgs
+                         + kernel_autoremove_pkgs]
+>>>>>>> UpdateManager/Core/UpdateList.py
             self._populate_desktop_cache(pkg_names)
         self.oem_groups = self._make_groups(
             cache, oem_pkgs, eventloop_callback
@@ -655,6 +803,7 @@ class UpdateList:
             cache, security_pkgs, eventloop_callback
         )
         self.kernel_autoremove_groups = self._make_groups(
+<<<<<<< UpdateManager/Core/UpdateList.py
             cache, kernel_autoremove_pkgs, eventloop_callback, True
         )
         self.duplicate_groups = self._make_groups(
@@ -666,3 +815,10 @@ class UpdateList:
         self.ubuntu_pro_groups = self._make_groups(
             cache, pro_pkgs, eventloop_callback
         )
+=======
+            cache, kernel_autoremove_pkgs, eventloop_callback, True)
+        self.ubuntu_pro_fake_groups = self._make_groups(
+            cache, fake_ua_packages, eventloop_callback, sensitive=False)
+        self.ubuntu_pro_groups = self._make_groups(
+            cache, pro_pkgs, eventloop_callback)
+>>>>>>> UpdateManager/Core/UpdateList.py
diff --git a/UpdateManager/Core/utils.py b/UpdateManager/Core/utils.py
index fbabac1..3fe6cdd 100644
--- a/UpdateManager/Core/utils.py
+++ b/UpdateManager/Core/utils.py
@@ -244,10 +244,15 @@ def url_downloadable(uri, debug_func=None):
         lambda x: True
     debug_func("url_downloadable: %s" % uri)
     (scheme, netloc, path, querry, fragment) = urlsplit(uri)
+<<<<<<< UpdateManager/Core/utils.py
     debug_func(
         "s='%s' n='%s' p='%s' q='%s' f='%s'"
         % (scheme, netloc, path, querry, fragment)
     )
+=======
+    debug_func("s='%s' n='%s' p='%s' q='%s' f='%s'" % (scheme, netloc, path,
+                                                       querry, fragment))
+>>>>>>> UpdateManager/Core/utils.py
     if scheme in ("http", "https"):
         try:
             http_file = urlopen(HeadRequest(uri))
@@ -289,7 +294,11 @@ def init_proxy(gsettings=None):
     SYNAPTIC_CONF_FILE = "/root/.synaptic/synaptic.conf"
     proxies = {}
     # generic apt config wins
+<<<<<<< UpdateManager/Core/utils.py
     if apt_pkg.config.find("Acquire::http::Proxy") != "":
+=======
+    if apt_pkg.config.find("Acquire::http::Proxy") != '':
+>>>>>>> UpdateManager/Core/utils.py
         proxies["http"] = apt_pkg.config.find("Acquire::http::Proxy")
     # then synaptic
     elif os.path.exists(SYNAPTIC_CONF_FILE):
@@ -301,7 +310,11 @@ def init_proxy(gsettings=None):
             proxy_port = str(cnf.find_i("Synaptic::httpProxyPort"))
             if proxy_host and proxy_port:
                 proxies["http"] = "http://%s:%s/" % (proxy_host, proxy_port)
+<<<<<<< UpdateManager/Core/utils.py
     if apt_pkg.config.find("Acquire::https::Proxy") != "":
+=======
+    if apt_pkg.config.find("Acquire::https::Proxy") != '':
+>>>>>>> UpdateManager/Core/utils.py
         proxies["https"] = apt_pkg.config.find("Acquire::https::Proxy")
     elif "http" in proxies:
         proxies["https"] = proxies["http"]
@@ -309,7 +322,11 @@ def init_proxy(gsettings=None):
     if proxies:
         # basic verification
         for proxy in proxies.values():
+<<<<<<< UpdateManager/Core/utils.py
             if not re.match("https?://\\w+", proxy):
+=======
+            if not re.match("https?://\w+", proxy):
+>>>>>>> UpdateManager/Core/utils.py
                 print("proxy '%s' looks invalid" % proxy, file=sys.stderr)
                 return
         proxy_support = ProxyHandler(proxies)
diff --git a/UpdateManager/Dialogs.py b/UpdateManager/Dialogs.py
index 304609c..30e29c9 100644
--- a/UpdateManager/Dialogs.py
+++ b/UpdateManager/Dialogs.py
@@ -159,6 +159,7 @@ class InternalDialog(BuilderDialog):
         self.set_desc(None)
 
         if not active:
+<<<<<<< UpdateManager/Dialogs.py
             if (
                 self._is_livepatch_supported()
                 and self.settings_button
@@ -171,6 +172,14 @@ class InternalDialog(BuilderDialog):
                         "secure between restarts."
                     )
                 )
+=======
+            if self._is_livepatch_supported() and \
+               self.settings_button and \
+               self.settings.get_int('launch-count') >= 4:
+                self.set_desc(_("<b>Tip:</b> You can use Livepatch with "
+                                "Ubuntu Pro to keep your computer more "
+                                "secure between restarts."))
+>>>>>>> UpdateManager/Dialogs.py
                 self.settings_button.set_label(_("Settings & Pro…"))
             return
 
@@ -236,9 +245,14 @@ class NoUpdatesDialog(InternalDialog):
         else:
             self.set_header(_("The software on this computer is up to date."))
         self.settings_button = self.add_settings_button()
+<<<<<<< UpdateManager/Dialogs.py
         self.focus_button = self.add_button(
             Gtk.STOCK_OK, self.window_main.close
         )
+=======
+        self.focus_button = self.add_button(Gtk.STOCK_OK,
+                                            self.window_main.close)
+>>>>>>> UpdateManager/Dialogs.py
         self.check_livepatch_status()
 
 
@@ -326,6 +340,7 @@ class NoUpgradeForYouDialog(InternalDialog):
         InternalDialog.__init__(self, window_main)
         self.set_header(_("Sorry, there are no more upgrades for this system"))
         # Translators: this is an Ubuntu version name like "Ubuntu 12.04"
+<<<<<<< UpdateManager/Dialogs.py
         self.set_desc(
             _(
                 "\nThere will not be any further Ubuntu releases "
@@ -339,6 +354,17 @@ class NoUpgradeForYouDialog(InternalDialog):
         self.focus_button = self.add_button(
             Gtk.STOCK_OK, self.window_main.close
         )
+=======
+        self.set_desc(_("\nThere will not be any further Ubuntu releases "
+                        "for this system's '%s' architecture.\n\n"
+                        "Updates for Ubuntu %s will continue until "
+                        "2023-04-26.\n\nIf you reinstall Ubuntu from "
+                        "ubuntu.com/download, future upgrades will "
+                        "be available.") %
+                       (arch, meta_release.current_dist_version))
+        self.focus_button = self.add_button(Gtk.STOCK_OK,
+                                            self.window_main.close)
+>>>>>>> UpdateManager/Dialogs.py
 
 
 class PartialUpgradeDialog(InternalDialog):
diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py
index 2e6aed4..2c853f5 100644
--- a/UpdateManager/UpdateManager.py
+++ b/UpdateManager/UpdateManager.py
@@ -35,7 +35,10 @@ warnings.filterwarnings(
 )
 
 import distro_info
+<<<<<<< UpdateManager/UpdateManager.py
 import fnmatch
+=======
+>>>>>>> UpdateManager/UpdateManager.py
 import json
 import os
 import subprocess
@@ -50,6 +53,7 @@ from dbus.mainloop.glib import DBusGMainLoop
 DBusGMainLoop(set_as_default=True)
 
 from .UnitySupport import UnitySupport
+<<<<<<< UpdateManager/UpdateManager.py
 from .Dialogs import (
     DistUpgradeDialog,
     ErrorDialog,
@@ -62,6 +66,18 @@ from .Dialogs import (
     UnsupportedDialog,
     UpdateErrorDialog,
 )
+=======
+from .Dialogs import (DistUpgradeDialog,
+                      ErrorDialog,
+                      HWEUpgradeDialog,
+                      NeedRestartDialog,
+                      NoUpdatesDialog,
+                      NoUpgradeForYouDialog,
+                      PartialUpgradeDialog,
+                      StoppedUpdatesDialog,
+                      UnsupportedDialog,
+                      UpdateErrorDialog)
+>>>>>>> UpdateManager/UpdateManager.py
 from .MetaReleaseGObject import MetaRelease
 from .UpdatesAvailable import UpdatesAvailable
 from .Core.AlertWatcher import AlertWatcher
@@ -69,7 +85,12 @@ from .Core.MyCache import MyCache
 from .Core.roam import NetworkManagerHelper
 from .Core.UpdateList import UpdateList
 from .Core.utils import get_arch, get_dist, SoftwarePropertiesPage
+<<<<<<< UpdateManager/UpdateManager.py
 from .backend import InstallBackend, get_backend
+=======
+from .backend import (InstallBackend,
+                      get_backend)
+>>>>>>> UpdateManager/UpdateManager.py
 
 # file that signals if we need to reboot
 REBOOT_REQUIRED_FILE = "/var/run/reboot-required"
@@ -92,8 +113,11 @@ class UpdateManager(Gtk.Window):
         self.update_list = None
         self.meta_release = None
         self.hwe_replacement_packages = None
+<<<<<<< UpdateManager/UpdateManager.py
         self.oem_metapackages = set()
         self.duplicate_packages = []
+=======
+>>>>>>> UpdateManager/UpdateManager.py
         self.arch = get_arch()
 
         # Basic GTK+ parameters
@@ -103,9 +127,15 @@ class UpdateManager(Gtk.Window):
 
         # Keep window at a constant size
         ctx = self.get_style_context()
+<<<<<<< UpdateManager/UpdateManager.py
         self.style_changed = ctx.connect(
             "changed", lambda ctx: self.resize_to_standard_width()
         )
+=======
+        self.style_changed = ctx.connect("changed",
+                                         lambda ctx:
+                                             self.resize_to_standard_width())
+>>>>>>> UpdateManager/UpdateManager.py
 
         # Signals
         self.connect("delete-event", self._on_close)
@@ -203,6 +233,13 @@ class UpdateManager(Gtk.Window):
         sys.exit(0)
 
     def show_settings(self, page_number=SoftwarePropertiesPage.updates):
+<<<<<<< UpdateManager/UpdateManager.py
+=======
+        try:
+            apt_pkg.pkgsystem_unlock()
+        except SystemError:
+            pass
+>>>>>>> UpdateManager/UpdateManager.py
         cmd = ["/usr/bin/software-properties-gtk",
                "--open-tab", str(page_number)]
 
@@ -247,6 +284,7 @@ class UpdateManager(Gtk.Window):
         if self.cache is None:
             return
 
+<<<<<<< UpdateManager/UpdateManager.py
         pane = self._make_available_pane(
             self.cache.install_count + self.cache.del_count,
             os.path.exists(REBOOT_REQUIRED_FILE),
@@ -276,6 +314,13 @@ class UpdateManager(Gtk.Window):
             if fnmatch.fnmatch(pkg.name, "oem-*-meta") and pkg.installed:
                 self.oem_metapackages.add(pkg)
 
+=======
+        pane = self._make_available_pane(self.cache.install_count,
+                                         os.path.exists(REBOOT_REQUIRED_FILE),
+                                         cancelled_update, error_occurred)
+        self._start_pane(pane)
+
+>>>>>>> UpdateManager/UpdateManager.py
     def _get_ua_security_status(self):
         self.ua_security_packages = []
         try:
@@ -307,6 +352,7 @@ class UpdateManager(Gtk.Window):
                     )
             self.cache.create_pro_cache(self.ua_security_packages)
 
+<<<<<<< UpdateManager/UpdateManager.py
     def _make_available_pane(
         self,
         install_count,
@@ -314,6 +360,10 @@ class UpdateManager(Gtk.Window):
         cancelled_update=False,
         error_occurred=False,
     ):
+=======
+    def _make_available_pane(self, install_count, need_reboot=False,
+                             cancelled_update=False, error_occurred=False):
+>>>>>>> UpdateManager/UpdateManager.py
         self._check_hwe_support_status()
         if install_count != 0 or len(self.ua_security_packages) > 0:
             header = None
@@ -322,9 +372,14 @@ class UpdateManager(Gtk.Window):
                 desc = _("Some software couldn’t be checked for updates.")
             elif cancelled_update:
                 header = _("You stopped the check for updates.")
+<<<<<<< UpdateManager/UpdateManager.py
                 desc = _(
                     "Updated software is available from a previous check."
                 )
+=======
+                desc = _("Updated software is available from "
+                         "a previous check.")
+>>>>>>> UpdateManager/UpdateManager.py
             # Display HWE updates first as an old HWE stack is vulnerable
             elif self.hwe_replacement_packages:
                 return HWEUpgradeDialog(self)
@@ -380,6 +435,7 @@ class UpdateManager(Gtk.Window):
 
         # Check for new fresh release
         settings = Gio.Settings.new("com.ubuntu.update-manager")
+<<<<<<< UpdateManager/UpdateManager.py
         if self.meta_release.new_dist and (
             self.options.check_dist_upgrades
             or settings.get_boolean("check-dist-upgrades")
@@ -388,6 +444,14 @@ class UpdateManager(Gtk.Window):
                 return NoUpgradeForYouDialog(
                     self, self.meta_release, self.arch
                 )
+=======
+        if (self.meta_release.new_dist and
+                (self.options.check_dist_upgrades or
+                 settings.get_boolean("check-dist-upgrades"))):
+            if self.arch == 'i386':
+                return NoUpgradeForYouDialog(self, self.meta_release,
+                                             self.arch)
+>>>>>>> UpdateManager/UpdateManager.py
             return DistUpgradeDialog(self, self.meta_release)
 
         return None
@@ -448,22 +512,37 @@ class UpdateManager(Gtk.Window):
             self._start_pane(PartialUpgradeDialog(self))
             # we assert a clean cache
             header = _("Software index is broken")
+<<<<<<< UpdateManager/UpdateManager.py
             desc = _(
                 "It is impossible to install or remove any software. "
                 'Please use the package manager "Synaptic" or run '
                 '"sudo apt-get install -f" in a terminal to fix '
                 "this issue at first."
             )
+=======
+            desc = _("It is impossible to install or remove any software. "
+                     "Please use the package manager \"Synaptic\" or run "
+                     "\"sudo apt-get install -f\" in a terminal to fix "
+                     "this issue at first.")
+>>>>>>> UpdateManager/UpdateManager.py
             self.start_error(False, header, desc)
             return
         except SystemError as e:
             header = _("Could not initialize the package information")
+<<<<<<< UpdateManager/UpdateManager.py
             desc = _(
                 "An unresolvable problem occurred while "
                 "initializing the package information.\n\n"
                 "Please report this bug against the 'update-manager' "
                 "package and include the following error message:\n"
             ) + str(e)
+=======
+            desc = _("An unresolvable problem occurred while "
+                     "initializing the package information.\n\n"
+                     "Please report this bug against the 'update-manager' "
+                     "package and include the following error "
+                     "message:\n") + str(e)
+>>>>>>> UpdateManager/UpdateManager.py
             self.start_error(False, header, desc)
             return
 
@@ -474,6 +553,7 @@ class UpdateManager(Gtk.Window):
 
         iterate()
 
+<<<<<<< UpdateManager/UpdateManager.py
         self._check_oem_metapackages()
 
         self._get_ua_security_status()
@@ -493,6 +573,15 @@ class UpdateManager(Gtk.Window):
                 duplicate_packages=self.duplicate_packages,
                 ua_security_packages=self.ua_security_packages,
             )
+=======
+        self._get_ua_security_status()
+
+        self.update_list = UpdateList(self)
+        try:
+            self.update_list.update(self.cache, eventloop_callback=iterate,
+                                    ua_security_packages=self.
+                                    ua_security_packages)
+>>>>>>> UpdateManager/UpdateManager.py
         except SystemError as e:
             header = _("Could not calculate the upgrade")
             desc = _(
diff --git a/UpdateManager/UpdatesAvailable.py b/UpdateManager/UpdatesAvailable.py
index 75cfd33..7477ffd 100644
--- a/UpdateManager/UpdatesAvailable.py
+++ b/UpdateManager/UpdatesAvailable.py
@@ -75,6 +75,7 @@ from .UnitySupport import UnitySupport
 # - screen reader does not say "Downloaded" for downloaded updates
 
 # list constants
+<<<<<<< UpdateManager/UpdatesAvailable.py
 (
     LIST_NAME,
     LIST_UPDATE_DATA,
@@ -82,6 +83,10 @@ from .UnitySupport import UnitySupport
     LIST_TOGGLE_ACTIVE,
     LIST_SENSITIVE,
 ) = range(5)
+=======
+(LIST_NAME, LIST_UPDATE_DATA, LIST_SIZE, LIST_TOGGLE_ACTIVE,
+ LIST_SENSITIVE) = range(5)
+>>>>>>> UpdateManager/UpdatesAvailable.py
 
 # NetworkManager enums
 from .Core.roam import NetworkManagerHelper
@@ -256,6 +261,7 @@ class UpdatesAvailable(InternalDialog):
         #    self.button_help.set_sensitive(False)
 
         self.add_settings_button()
+<<<<<<< UpdateManager/UpdatesAvailable.py
         self.button_close = self.add_button(
             Gtk.STOCK_CANCEL, self.window_main.close
         )
@@ -265,6 +271,14 @@ class UpdatesAvailable(InternalDialog):
         self.button_install = self.add_button(
             _("Install Now"), self.on_button_install_clicked
         )
+=======
+        self.button_close = self.add_button(Gtk.STOCK_CANCEL,
+                                            self.window_main.close)
+        self.button_pro = self.add_button(_("Enable Ubuntu Pro..."),
+                                          self.on_button_pro_clicked)
+        self.button_install = self.add_button(_("Install Now"),
+                                              self.on_button_install_clicked)
+>>>>>>> UpdateManager/UpdatesAvailable.py
         self.focus_button = self.button_install
 
         # create text view
@@ -310,6 +324,7 @@ class UpdatesAvailable(InternalDialog):
         pkg_toggle_renderer.set_property("ypad", 2)
         pkg_toggle_renderer.connect("toggled", self.on_update_toggled)
         pkg_column.pack_start(pkg_toggle_renderer, False)
+<<<<<<< UpdateManager/UpdatesAvailable.py
         pkg_column.add_attribute(
             pkg_toggle_renderer, "active", LIST_TOGGLE_ACTIVE
         )
@@ -319,6 +334,14 @@ class UpdatesAvailable(InternalDialog):
         pkg_column.set_cell_data_func(
             pkg_toggle_renderer, self.pkg_toggle_renderer_data_func
         )
+=======
+        pkg_column.add_attribute(pkg_toggle_renderer,
+                                 'active', LIST_TOGGLE_ACTIVE)
+        pkg_column.add_attribute(pkg_toggle_renderer,
+                                 'sensitive', LIST_SENSITIVE)
+        pkg_column.set_cell_data_func(pkg_toggle_renderer,
+                                      self.pkg_toggle_renderer_data_func)
+>>>>>>> UpdateManager/UpdatesAvailable.py
 
         pkg_icon_renderer = Gtk.CellRendererPixbuf()
         pkg_icon_renderer.set_property("ypad", 2)
@@ -346,7 +369,12 @@ class UpdatesAvailable(InternalDialog):
             _("Download"), size_renderer, text=LIST_SIZE
         )
         size_column.set_sizing(Gtk.TreeViewColumnSizing.AUTOSIZE)
+<<<<<<< UpdateManager/UpdatesAvailable.py
         size_column.add_attribute(size_renderer, "sensitive", LIST_SENSITIVE)
+=======
+        size_column.add_attribute(size_renderer,
+                                  'sensitive', LIST_SENSITIVE)
+>>>>>>> UpdateManager/UpdatesAvailable.py
         self.treeview_update.append_column(size_column)
 
         self.treeview_update.set_headers_visible(True)
@@ -371,9 +399,14 @@ class UpdatesAvailable(InternalDialog):
             self.settings.get_boolean("show-details")
         )
         self.expander_details.connect("activate", self.pre_activate_details)
+<<<<<<< UpdateManager/UpdatesAvailable.py
         self.expander_details.connect(
             "notify::expanded", self.activate_details
         )
+=======
+        self.expander_details.connect("notify::expanded",
+                                      self.activate_details)
+>>>>>>> UpdateManager/UpdatesAvailable.py
 
         # If auto-updates are on, change cancel label
         self.notifier_settings = Gio.Settings.new("com.ubuntu.update-notifier")
@@ -401,6 +434,17 @@ class UpdatesAvailable(InternalDialog):
             self.news.get_buffer().set_text(apt_news)
             self.expander_news.set_visible(True)
 
+        try:
+            from uaclient.api.u.apt_news.current_news.v1 import current_news
+            apt_news = current_news().current_news
+        except ImportError:
+            apt_news = self._get_apt_news(
+                "/var/lib/ubuntu-advantage/messages/apt-news"
+            )
+        if apt_news:
+            self.news.get_buffer().set_text(apt_news)
+            self.expander_news.set_visible(True)
+
     def stop(self):
         InternalDialog.stop(self)
         self._save_state()
@@ -584,6 +628,7 @@ class UpdatesAvailable(InternalDialog):
                 version = version_match.group(1)
                 # upload_archive = version_match.group(2).strip()
                 version_text = _("Version %s: \n") % version
+<<<<<<< UpdateManager/UpdatesAvailable.py
                 changes_buffer.insert_with_tags_by_name(
                     end_iter, version_text, "versiontag"
                 )
@@ -592,6 +637,14 @@ class UpdatesAvailable(InternalDialog):
                     end_iter, line + "\n", "changestag"
                 )
             elif author_match:
+=======
+                changes_buffer.insert_with_tags_by_name(end_iter, version_text,
+                                                        "versiontag")
+            elif changes_match:
+                changes_buffer.insert_with_tags_by_name(end_iter, line + "\n",
+                                                        "changestag")
+            elif (author_match):
+>>>>>>> UpdateManager/UpdatesAvailable.py
                 pass
             else:
                 changes_buffer.insert(end_iter, line + "\n")
@@ -633,7 +686,10 @@ class UpdatesAvailable(InternalDialog):
         # replace all multiple spaces by newlines
         p = re.compile(r"\s\s+", re.MULTILINE)
         long_desc = p.sub("\n", long_desc)
+<<<<<<< UpdateManager/UpdatesAvailable.py
         long_desc = "Package: %s\n%s" % (item.pkg.name, long_desc)
+=======
+>>>>>>> UpdateManager/UpdatesAvailable.py
 
         # now do the changelog
         name = item.pkg.name
@@ -851,8 +907,13 @@ class UpdatesAvailable(InternalDialog):
                     self.button_pro.destroy()
                 elif (self.list.ubuntu_pro_fake_groups
                       and not self.list.ubuntu_pro_groups):
+<<<<<<< UpdateManager/UpdatesAvailable.py
                     download_str = _("You need to enable Ubuntu Pro to install"
                                      " these updates.")
+=======
+                    download_str = _("You need to enable Ubuntu Pro to "
+                                     "install these updates.")
+>>>>>>> UpdateManager/UpdatesAvailable.py
                     self.button_install.destroy()
                 else:
                     download_str = _("There are no updates to install.")
@@ -1140,7 +1201,11 @@ class UpdatesAvailable(InternalDialog):
             UpdateData(groups, None, None),
             humanize_size(total_size),
             True,
+<<<<<<< UpdateManager/UpdatesAvailable.py
             sensitive,
+=======
+            sensitive
+>>>>>>> UpdateManager/UpdatesAvailable.py
         ]
         return self.store.append(None, header_row)
 
@@ -1163,16 +1228,23 @@ class UpdatesAvailable(InternalDialog):
 
             if group.name == "Ubuntu base":
                 group.name = "System components"
+<<<<<<< UpdateManager/UpdatesAvailable.py
             name = group.name
             if len(group.items) > 1:
                 name = '%s (%d)' % (group.name, len(group.items))
 
+=======
+>>>>>>> UpdateManager/UpdatesAvailable.py
             group_row = [
                 name,
                 UpdateData(None, group, group_is_item),
                 humanize_size(group.get_total_size()),
                 True,
+<<<<<<< UpdateManager/UpdatesAvailable.py
                 group.sensitive,
+=======
+                group.sensitive
+>>>>>>> UpdateManager/UpdatesAvailable.py
             ]
             group_iter = self.store.append(None, group_row)
 
@@ -1184,7 +1256,11 @@ class UpdatesAvailable(InternalDialog):
                     UpdateData(None, None, item),
                     humanize_size(getattr(item.pkg.candidate, "size", 0)),
                     True,
+<<<<<<< UpdateManager/UpdatesAvailable.py
                     group.sensitive,
+=======
+                    group.sensitive
+>>>>>>> UpdateManager/UpdatesAvailable.py
                 ]
                 self.store.append(group_iter, item_row)
 
@@ -1219,12 +1295,15 @@ class UpdatesAvailable(InternalDialog):
                 self.list.kernel_autoremove_groups,
             )
             self._add_groups(self.list.kernel_autoremove_groups)
+<<<<<<< UpdateManager/UpdatesAvailable.py
         if self.list.duplicate_groups:
             self._add_header(
                 _("Duplicate packages to be removed"),
                 self.list.duplicate_groups,
             )
             self._add_groups(self.list.duplicate_groups)
+=======
+>>>>>>> UpdateManager/UpdatesAvailable.py
         if self.list.ubuntu_pro_groups:
             self._add_header(
                 _("Ubuntu Pro security updates"),
@@ -1246,9 +1325,13 @@ class UpdatesAvailable(InternalDialog):
             or bool(self.list.ubuntu_pro_groups)
             or bool(self.list.update_groups)
             or bool(self.list.security_groups)
+<<<<<<< UpdateManager/UpdatesAvailable.py
             or bool(self.list.kernel_autoremove_groups)
             or bool(self.list.duplicate_groups)
         )
+=======
+            or bool(self.list.kernel_autoremove_groups))
+>>>>>>> UpdateManager/UpdatesAvailable.py
         self.update_close_button()
         self.update_count()
         self.setBusy(False)
diff --git a/UpdateManager/backend/InstallBackendAptdaemon.py b/UpdateManager/backend/InstallBackendAptdaemon.py
index 2959aa6..aed2548 100644
--- a/UpdateManager/backend/InstallBackendAptdaemon.py
+++ b/UpdateManager/backend/InstallBackendAptdaemon.py
@@ -129,9 +129,12 @@ class InstallBackendAptdaemon(InstallBackend, BuilderDialog):
         self._expanded_size = None
         self.button_cancel = None
         self.trans_failed_msg = None
+<<<<<<< UpdateManager/backend/InstallBackendAptdaemon.py
         self.progressbar = None
         self._active_transaction = None
         self._expander = None
+=======
+>>>>>>> UpdateManager/backend/InstallBackendAptdaemon.py
 
     def close(self):
         if self.button_cancel and self.button_cancel.get_sensitive():
@@ -328,6 +331,7 @@ class InstallBackendAptdaemon(InstallBackend, BuilderDialog):
         try:
             reinstall = purge = downgrade = []
             trans = yield self.client.commit_packages(
+<<<<<<< UpdateManager/backend/InstallBackendAptdaemon.py
                 pkgs_install,
                 reinstall,
                 pkgs_remove,
@@ -347,6 +351,17 @@ class InstallBackendAptdaemon(InstallBackend, BuilderDialog):
                 error_string=None,
                 error_desc=None,
             )
+=======
+                pkgs_install, reinstall, pkgs_remove, purge, pkgs_upgrade,
+                downgrade, defer=True)
+            trans.connect("progress-changed", self._on_progress_changed)
+            yield self._show_transaction(trans, self.ACTION_INSTALL,
+                                         _("Installing updates…"), True)
+        except errors.NotAuthorizedError as e:
+            self._action_done(self.ACTION_INSTALL,
+                              authorized=False, success=False,
+                              error_string=None, error_desc=None)
+>>>>>>> UpdateManager/backend/InstallBackendAptdaemon.py
         except errors.TransactionFailed as e:
             self.trans_failed_msg = str(e)
         except dbus.DBusException as e:
@@ -524,6 +539,7 @@ class InstallBackendAptdaemon(InstallBackend, BuilderDialog):
                 error_desc = error_desc + "\n" + self.trans_failed_msg
         # tell unity to hide the progress again
         self.unity.set_progress(-1)
+<<<<<<< UpdateManager/backend/InstallBackendAptdaemon.py
         is_success = status == EXIT_SUCCESS
         try:
             self._action_done(
@@ -534,10 +550,19 @@ class InstallBackendAptdaemon(InstallBackend, BuilderDialog):
                 error_desc=error_desc,
                 trans_failed=trans_failed,
             )
+=======
+        is_success = (status == EXIT_SUCCESS)
+        try:
+            self._action_done(action,
+                              authorized=True, success=is_success,
+                              error_string=error_string, error_desc=error_desc,
+                              trans_failed=trans_failed)
+>>>>>>> UpdateManager/backend/InstallBackendAptdaemon.py
         except TypeError:
             # this module used to be be lazily imported and in older code
             # trans_failed= is not accepted
             # TODO: this workaround can be dropped in Ubuntu 20.10
+<<<<<<< UpdateManager/backend/InstallBackendAptdaemon.py
             self._action_done(
                 action,
                 authorized=True,
@@ -545,6 +570,11 @@ class InstallBackendAptdaemon(InstallBackend, BuilderDialog):
                 error_string=error_string,
                 error_desc=error_desc,
             )
+=======
+            self._action_done(action,
+                              authorized=True, success=is_success,
+                              error_string=error_string, error_desc=error_desc)
+>>>>>>> UpdateManager/backend/InstallBackendAptdaemon.py
 
 
 if __name__ == "__main__":
diff --git a/UpdateManager/backend/__init__.py b/UpdateManager/backend/__init__.py
index 72a6031..9c669e6 100644
--- a/UpdateManager/backend/__init__.py
+++ b/UpdateManager/backend/__init__.py
@@ -11,8 +11,11 @@ gi.require_version("Snapd", "2")
 from gi.repository import GLib, Gtk, Snapd
 
 from apt import Cache
+<<<<<<< UpdateManager/backend/__init__.py
 import json
 import logging
+=======
+>>>>>>> UpdateManager/backend/__init__.py
 import os
 import re
 import subprocess
@@ -65,14 +68,20 @@ class InstallBackend(Dialog):
             fresh_cache = Cache(rootdir=self.window_main.cache.rootdir)
             for pkg in self.window_main.cache:
                 try:
+<<<<<<< UpdateManager/backend/__init__.py
                     if (
                         pkg.marked_install
                         and not fresh_cache[pkg.name].is_installed
                     ):
+=======
+                    if pkg.marked_install and \
+                       not fresh_cache[pkg.name].is_installed:
+>>>>>>> UpdateManager/backend/__init__.py
                         pkgname = pkg.name
                         if pkg.is_auto_installed:
                             pkgname += "#auto"
                         pkgs_install.append(pkgname)
+<<<<<<< UpdateManager/backend/__init__.py
                     elif (
                         pkg.marked_upgrade
                         and fresh_cache[pkg.name].is_upgradable
@@ -82,6 +91,13 @@ class InstallBackend(Dialog):
                         pkg.marked_delete
                         and fresh_cache[pkg.name].is_installed
                     ):
+=======
+                    elif (pkg.marked_upgrade and
+                          fresh_cache[pkg.name].is_upgradable):
+                        pkgs_upgrade.append(pkg.name)
+                    elif (pkg.marked_delete and
+                          fresh_cache[pkg.name].is_installed):
+>>>>>>> UpdateManager/backend/__init__.py
                         pkgs_remove.append(pkg.name)
                 except KeyError:
                     # pkg missing from fresh_cache can't be modified
@@ -247,6 +263,7 @@ class InstallBackend(Dialog):
                     plug = conn_cols[1]
                     slot = conn_cols[2]
 
+<<<<<<< UpdateManager/backend/__init__.py
                     if slot.startswith(snap + ":"):
                         plug_snap = plug.split(":")[0]
                         if (
@@ -373,6 +390,10 @@ class InstallBackend(Dialog):
         error_desc,
         trans_failed=False,
     ):
+=======
+    def _action_done(self, action, authorized, success, error_string,
+                     error_desc, trans_failed=False):
+>>>>>>> UpdateManager/backend/__init__.py
 
         # If the progress dialog should be closed automatically afterwards
         # settings = Gio.Settings.new("com.ubuntu.update-manager")
@@ -395,9 +416,14 @@ class InstallBackend(Dialog):
             elif success:
                 self.window_main.start_available()
             elif error_string:
+<<<<<<< UpdateManager/backend/__init__.py
                 self.window_main.start_error(
                     trans_failed, error_string, error_desc
                 )
+=======
+                self.window_main.start_error(trans_failed, error_string,
+                                             error_desc)
+>>>>>>> UpdateManager/backend/__init__.py
             else:
                 # exit gracefuly, we can't just exit as this will trigger
                 # a crash if system.exit() is called in a exception handler
@@ -418,14 +444,20 @@ class InstallBackend(Dialog):
 
 
 # try aptdaemon
+<<<<<<< UpdateManager/backend/__init__.py
 if (
     os.path.exists("/usr/sbin/aptd")
     and "UPDATE_MANAGER_FORCE_BACKEND_SYNAPTIC" not in os.environ
 ):
+=======
+if os.path.exists("/usr/sbin/aptd") \
+   and "UPDATE_MANAGER_FORCE_BACKEND_SYNAPTIC" not in os.environ:
+>>>>>>> UpdateManager/backend/__init__.py
     # check if the gtkwidgets are installed as well
     try:
         from .InstallBackendAptdaemon import InstallBackendAptdaemon
     except ImportError:
+<<<<<<< UpdateManager/backend/__init__.py
         logging.exception("importing aptdaemon")
 # try synaptic
 if (
@@ -435,6 +467,17 @@ if (
     try:
         from .InstallBackendSynaptic import InstallBackendSynaptic
     except ImportError:
+=======
+        import logging
+        logging.exception("importing aptdaemon")
+# try synaptic
+if os.path.exists("/usr/sbin/synaptic") \
+   and "UPDATE_MANAGER_FORCE_BACKEND_APTDAEMON" not in os.environ:
+    try:
+        from .InstallBackendSynaptic import InstallBackendSynaptic
+    except ImportError:
+        import logging
+>>>>>>> UpdateManager/backend/__init__.py
         logging.exception("importing synaptic")
 
 
@@ -449,18 +492,31 @@ def get_backend(*args, **kwargs):
         try:
             return InstallBackendAptdaemon(*args, **kwargs)
         except NameError:
+<<<<<<< UpdateManager/backend/__init__.py
             logging.exception("using aptdaemon failed")
     # try synaptic
     if (
         os.path.exists("/usr/sbin/synaptic")
         and "UPDATE_MANAGER_FORCE_BACKEND_APTDAEMON" not in os.environ
     ):
+=======
+            import logging
+            logging.exception("using aptdaemon failed")
+    # try synaptic
+    if (os.path.exists("/usr/sbin/synaptic")
+            and "UPDATE_MANAGER_FORCE_BACKEND_APTDAEMON" not in os.environ):
+>>>>>>> UpdateManager/backend/__init__.py
         try:
             return InstallBackendSynaptic(*args, **kwargs)
         except NameError:
             pass
     # nothing found, raise
+<<<<<<< UpdateManager/backend/__init__.py
     raise Exception(
         "No working backend found, please try installing "
         "aptdaemon or synaptic"
     )
+=======
+    raise Exception("No working backend found, please try installing "
+                    "aptdaemon or synaptic")
+>>>>>>> UpdateManager/backend/__init__.py
diff --git a/debian/changelog b/debian/changelog
index b8ee063..3235c19 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,37 @@
+<<<<<<< debian/changelog
 update-manager (1:24.04.1) noble; urgency=medium
+=======
+update-manager (1:18.04.11.21) bionic; urgency=medium
+>>>>>>> debian/changelog
 
   * Fix incorrect available version for Ubuntu Pro updates in unattached case
     (LP: #2043425).
 
+<<<<<<< debian/changelog
  -- Nathan Pratta Teodosio <[e-mail]>  Wed, 15 Nov 2023 11:45:02 +0100
 
 update-manager (1:23.10.2) mantic; urgency=medium
+=======
+ -- Nathan Pratta Teodosio <[e-mail]>  Thu, 16 Nov 2023 10:03:37 +0100
+ +0100
+
+update-manager (1:18.04.11.20) bionic; urgency=medium
+
+  * Ubuntu Pro (LP: #1990450):
+    - fix another linter error which was created while fixing a missing
+      space in the previous upload...
+
+ -- Sebastien Bacher <[e-mail]>  Fri, 06 Oct 2023 09:31:28 +0200
+
+update-manager (1:18.04.11.19) bionic; urgency=medium
+
+  * Ubuntu Pro (LP: #1990450):
+    - Address linter errors that cause autopkgtest to fail.
+
+ -- Nathan Pratta Teodosio <[e-mail]>  Thu, 05 Oct 2023 10:38:09 +0200
+
+update-manager (1:18.04.11.18) bionic; urgency=medium
+>>>>>>> debian/changelog
 
   * Ubuntu Pro (LP: #1990450):
     - Show Ubuntu Pro packages, whether the system is attached to Ubuntu Pro
@@ -16,6 +42,7 @@ update-manager (1:23.10.2) mantic; urgency=medium
     - Add News pane in a expander.
     - Replace notebook with Description and Changes tabs by a pane.
 
+<<<<<<< debian/changelog
  -- Nathan Pratta Teodosio <[e-mail]>  Mon, 25 Sep 2023 17:03:10 +0200
 
 update-manager (1:23.10.1) mantic; urgency=medium
@@ -296,12 +323,44 @@ update-manager (1:20.04.12) groovy; urgency=medium
  -- Marcus Tomlinson <[e-mail]>  Thu, 28 May 2020 10:11:51 +0100
 
 update-manager (1:20.04.11) groovy; urgency=medium
+=======
+ -- Nathan Pratta Teodosio <[e-mail]>  Tue, 29 Aug 2023 07:47:20 +0200
+
+update-manager (1:18.04.11.17) bionic; urgency=medium
+
+  * Fix Ubuntu Pro updates checkbox and expander widget from overlapping
+    (LP: #1990450)
+
+ -- Robert Ancell <[e-mail]>  Fri, 03 Feb 2023 14:55:56 +1300
+
+update-manager (1:18.04.11.16) bionic; urgency=medium
+
+  * Update of the parsing for pro client changes (lp: #1990450)
+
+ -- Sebastien Bacher <[e-mail]>  Thu, 26 Jan 2023 12:05:05 +0100
+
+update-manager (1:18.04.11.15) bionic; urgency=medium
+
+  * Show pending Ubuntu pro packages (LP: #1990450)
+
+ -- Robert Ancell <[e-mail]>  Wed, 18 Jan 2023 15:09:17 +1300
+
+update-manager (1:18.04.11.14) bionic; urgency=medium
+
+  * tests/test_meta_release_core.py: switch a test from using lucid to bionic
+    as precise was removed from the archive. (LP: #1929865)
+
+ -- Brian Murray <[e-mail]>  Thu, 27 May 2021 13:54:14 -0700
+
+update-manager (1:18.04.11.13) bionic; urgency=medium
+>>>>>>> debian/changelog
 
   * UpdateManager/UpdateManager.py: when refreshing the cache and encountering
     an error return rather than trying to use the undefined cache which causes
     crashes. Additionally, don't present the dialog with a "Try Again" button
     which won't do anything. (LP: #1826213)
 
+<<<<<<< debian/changelog
  -- Brian Murray <[e-mail]>  Wed, 27 May 2020 13:29:24 -0700
 
 update-manager (1:20.04.10) focal; urgency=medium
@@ -429,11 +488,37 @@ update-manager (1:19.04.3) disco; urgency=medium
  -- Jeremy Bicha <[e-mail]>  Sun, 10 Feb 2019 13:23:47 -0500
 
 update-manager (1:19.04.2) disco; urgency=medium
+=======
+ -- Brian Murray <[e-mail]>  Wed, 03 Jun 2020 11:41:50 -0700
+
+update-manager (1:18.04.11.12) bionic; urgency=medium
+
+  * Resolve pep8 failures.
+
+ -- Brian Murray <[e-mail]>  Tue, 21 Apr 2020 07:27:24 -0700
+
+update-manager (1:18.04.11.11) bionic; urgency=medium
+
+  * UpdateManager/UpdateManager.py: Do not offer to upgrade systems running on
+    an i386 host architecture to another release. (LP: #1845690)
+
+ -- Brian Murray <[e-mail]>  Thu, 09 Apr 2020 13:39:04 -0700
+
+update-manager (1:18.04.11.10) bionic; urgency=medium
+
+  * UpdateManager/Core/utils.py: when testing to see if a url is downloadable
+    support https in addition to http and ftp. (LP: #1823410)
+
+ -- Brian Murray <[e-mail]>  Tue, 09 Apr 2019 16:03:46 -0700
+
+update-manager (1:18.04.11.9) bionic; urgency=medium
+>>>>>>> debian/changelog
 
   * UpdateManager/Core/MetaRelease.py: set prompt in MetaReleaseCore so that
     do-release-upgrade can provide more informative error messages.
     (LP: #1798618, LP: #1795024)
 
+<<<<<<< debian/changelog
  -- Brian Murray <[e-mail]>  Wed, 28 Nov 2018 09:49:44 -0800
 
 update-manager (1:19.04.1) disco; urgency=medium
@@ -469,6 +554,39 @@ update-manager (1:18.10.9) cosmic; urgency=medium
  -- Balint Reczey <[e-mail]>  Mon, 01 Oct 2018 18:00:40 +0200
 
 update-manager (1:18.10.8) cosmic; urgency=medium
+=======
+ -- Brian Murray <[e-mail]>  Mon, 14 Jan 2019 13:40:08 -0800
+
+update-manager (1:18.04.11.8) bionic; urgency=medium
+
+  * Do not show the livepatch reminder if update-manager is running
+    on a distribution without software-properties-gtk. (LP: #1805118)  
+
+ -- Andrea Azzarone <[e-mail]>  Tue, 27 Nov 2018 13:26:00 +0000
+
+update-manager (1:18.04.11.7) bionic; urgency=medium
+
+  * Add a reminder to enable Livepatch (LP: #1787553).
+  * Build-Depends on python3-distro-info.
+
+ -- Andrea Azzarone <[e-mail]>  Fri, 07 Sep 2018 10:41:28 +0200
+
+update-manager (1:18.04.11.6) bionic; urgency=medium
+
+  * Keep or delete packages after looping over all of them.
+    This prevents the resolver from changing the packages in the loop resulting
+    in not keeping some phased packages back from being upgraded. (LP: #1072136)
+  * Stop lazy import of InstallBackends.
+    Lazy imports made update-manager crash when an update-manager
+    update changed the backend API and an updated incompatible backend
+    was loaded to the not updated running update-manager process. (LP: #1795898)
+  * Cancel transaction on exit only when Cancel button is active.
+    Also ignore exception when cancellation fails. (LP: #1790670)
+
+ -- Balint Reczey <[e-mail]>  Thu, 04 Oct 2018 21:33:57 +0200
+
+update-manager (1:18.04.11.5) bionic; urgency=medium
+>>>>>>> debian/changelog
 
   * Print transaction error and let the user try again applying updates
     (LP: #1317164)
@@ -480,6 +598,7 @@ update-manager (1:18.10.8) cosmic; urgency=medium
     a race condition where packages to be removed are already removed.
     (LP: #1791931)
 
+<<<<<<< debian/changelog
  -- Balint Reczey <[e-mail]>  Tue, 11 Sep 2018 13:40:57 +0200
 
 update-manager (1:18.10.7) cosmic; urgency=medium
@@ -512,10 +631,22 @@ update-manager (1:18.10.4) cosmic; urgency=medium
  -- Brian Murray <[e-mail]>  Fri, 31 Aug 2018 15:38:33 -0700
 
 update-manager (1:18.10.3) cosmic; urgency=medium
+=======
+ -- Balint Reczey <[e-mail]>  Mon, 17 Sep 2018 17:16:38 +0200
+
+update-manager (1:18.04.11.4) bionic; urgency=medium
+
+  * Adjust dates in hwe-support-status for bionic (LP: #1775236)
+
+ -- Julian Andres Klode <[e-mail]>  Fri, 20 Jul 2018 12:26:28 +0200
+
+update-manager (1:18.04.11.3) bionic; urgency=medium
+>>>>>>> debian/changelog
 
   * Add support for HTTPS proxies; this breaks UpdateManager.Core.utils.init_proxy()
     API - the return value is now a dict, rather than a string (LP: #1771914).
 
+<<<<<<< debian/changelog
  -- Julian Andres Klode <[e-mail]>  Wed, 27 Jun 2018 14:16:45 +0200
 
 update-manager (1:18.10.2) cosmic; urgency=medium
@@ -531,6 +662,24 @@ update-manager (1:18.10.1) cosmic; urgency=medium
     initial analysis of this bug. (LP: #1637180)
 
  -- Mathieu Trudel-Lapierre <[e-mail]>  Mon, 28 May 2018 10:03:52 -0400
+=======
+ -- Julian Andres Klode <[e-mail]>  Fri, 29 Jun 2018 14:44:16 +0200
+
+update-manager (1:18.04.11.2) bionic; urgency=medium
+
+  * Fix my embarassing typo that makes update-manager report crashes, when
+    instanciating the "reboot" dialog and mangling signals. (LP: #1774131)
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Fri, 08 Jun 2018 11:50:10 -0700
+
+update-manager (1:18.04.11.1) bionic; urgency=medium
+
+  * Block style context changed signal while enforcing the main window's
+    constant size. Thanks to Thomas Waldmann and Sebastien Bacher for the
+    initial analysis of  this bug. (LP: #1637180)
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Mon, 28 May 2018 10:13:12 -0400
+>>>>>>> debian/changelog
 
 update-manager (1:18.04.11) bionic; urgency=medium
 
diff --git a/debian/control b/debian/control
index c481028..f216b4e 100644
--- a/debian/control
+++ b/debian/control
@@ -9,8 +9,11 @@ Build-Depends: debhelper (>= 9),
                python3-all (>= 3.3.0-2),
                python3-dbus,
                python3-distro-info,
+<<<<<<< debian/control
                python3-distupgrade,
                python3-distutils-extra (>= 2.38),
+=======
+>>>>>>> debian/control
                python3-gi (>= 3.8),
                python3-yaml,
 Build-Depends-Indep: intltool,
@@ -25,6 +28,7 @@ Architecture: all
 Section: admin
 Depends: distro-info-data,
          python3-distro-info,
+<<<<<<< debian/control
          python3-update-manager (= ${source:Version}),
          ubuntu-advantage-tools,
          ubuntu-release-upgrader-core (>= 1:18.04.9),
@@ -34,6 +38,17 @@ Recommends: libpam-modules (>= 1.0.1-9ubuntu3),
 Replaces: update-manager (<< 1:0.146.2),
 Breaks: computer-janitor (<= 1.11-0ubuntu1),
         update-manager (<< 1:0.146.2),
+=======
+         python3-yaml,
+         distro-info-data,
+         lsb-release,
+         ubuntu-advantage-tools,
+         ubuntu-release-upgrader-core (>= 1:18.04.9)
+Recommends: libpam-modules (>= 1.0.1-9ubuntu3)
+Replaces: update-manager (<< 1:0.146.2)
+Breaks: update-manager (<< 1:0.146.2), 
+        computer-janitor (<= 1.11-0ubuntu1)
+>>>>>>> debian/control
 Description: manage release upgrades
  This is the core of update-manager and the release upgrader
 
diff --git a/hwe-support-status b/hwe-support-status
index fd484a3..fa14477 100755
--- a/hwe-support-status
+++ b/hwe-support-status
@@ -42,8 +42,13 @@ UNSUPPORTED_KERNEL_IMAGE_REGEX = (
 )
 
 # HWE stack with a long support period
+<<<<<<< hwe-support-status
 HWE_SUPPORTED_BACKPORT = "-hwe-22.04"
 SUPPORTED_KERNEL_IMAGE_REGEX = r"^$"  # No fixed backported kernel yet
+=======
+HWE_SUPPORTED_BACKPORT = "-hwe-18.04"
+SUPPORTED_KERNEL_IMAGE_REGEX = r'^$' # No fixed backported kernel yet
+>>>>>>> hwe-support-status
 
 
 KERNEL_METAPKGS = (
diff --git a/tests/test_backend_error.py b/tests/test_backend_error.py
index 38785cb..611bf0f 100644
--- a/tests/test_backend_error.py
+++ b/tests/test_backend_error.py
@@ -5,14 +5,26 @@ import logging
 import mock
 import sys
 import unittest
+<<<<<<< tests/test_backend_error.py
 from mock import patch
 
 import os
 
+=======
+from gettext import gettext as _
+from mock import patch
+
+from UpdateManager.Dialogs import NoUpdatesDialog
+from UpdateManager.UpdateManager import UpdateManager
+from UpdateManager.UpdatesAvailable import UpdatesAvailable
+
+import os
+>>>>>>> tests/test_backend_error.py
 CURDIR = os.path.dirname(os.path.abspath(__file__))
 
 
 class TestBackendError(unittest.TestCase):
+<<<<<<< tests/test_backend_error.py
     def setUp(self):
         os.environ["UPDATE_MANAGER_FORCE_BACKEND_APTDAEMON"] = "1"
 
@@ -32,11 +44,35 @@ class TestBackendError(unittest.TestCase):
         update.side_effect = lambda: update_backend._action_done(
             InstallBackend.ACTION_UPDATE, True, False, "string", "desc"
         )
+=======
+
+    def setUp(self):
+        os.environ['UPDATE_MANAGER_FORCE_BACKEND_APTDAEMON'] = '1'
+
+        def clear_environ():
+            del os.environ['UPDATE_MANAGER_FORCE_BACKEND_APTDAEMON']
+
+        self.addCleanup(clear_environ)
+
+    @patch('UpdateManager.backend.InstallBackendAptdaemon.update')
+    def test_backend_error(self, update):
+        main = mock.MagicMock()
+        main.datadir = os.path.join(CURDIR, '..', 'data')
+
+        from UpdateManager.backend import (InstallBackend, get_backend)
+        update_backend = get_backend(main, InstallBackend.ACTION_UPDATE)
+        update.side_effect = lambda: update_backend._action_done(
+            InstallBackend.ACTION_UPDATE, True, False, "string", "desc")
+>>>>>>> tests/test_backend_error.py
         update_backend.start()
         main.start_error.assert_called_once_with(True, "string", "desc")
 
 
+<<<<<<< tests/test_backend_error.py
 if __name__ == "__main__":
+=======
+if __name__ == '__main__':
+>>>>>>> tests/test_backend_error.py
     if len(sys.argv) > 1 and sys.argv[1] == "-v":
         logging.basicConfig(level=logging.DEBUG)
     unittest.main()
diff --git a/tests/test_hwe_support_status.py b/tests/test_hwe_support_status.py
index e811ef9..a4449eb 100644
--- a/tests/test_hwe_support_status.py
+++ b/tests/test_hwe_support_status.py
@@ -153,8 +153,12 @@ class HweSupportStatusTestCase(TestCase):
                 text = mock_print.call_args[0][0]
                 print("43242343243", mock_print.call_count)
                 self.assertIn(
+<<<<<<< tests/test_hwe_support_status.py
                     "Your system is supported until April 2027", text
                 )
+=======
+                    "Your system is supported until April 2023", text)
+>>>>>>> tests/test_hwe_support_status.py
 
     def test_advice_about_hwe_status_supported_hwe_stack(self):
         with patch("hwe_support_status.is_unsupported_hwe_running") as m:
@@ -174,9 +178,13 @@ class HweSupportStatusTestCase(TestCase):
                 text = mock_print.call_args[0][0]
                 self.assertIn(
                     "Your Hardware Enablement Stack (HWE) is supported "
+<<<<<<< tests/test_hwe_support_status.py
                     "until April 2027",
                     text,
                 )
+=======
+                    "until April 2023", text)
+>>>>>>> tests/test_hwe_support_status.py
 
 
 if __name__ == "__main__":
diff --git a/tests/test_meta_release_core.py b/tests/test_meta_release_core.py
index 954a0ba..37af4ae 100644
--- a/tests/test_meta_release_core.py
+++ b/tests/test_meta_release_core.py
@@ -121,6 +121,18 @@ class TestMetaReleaseCore(unittest.TestCase):
                 "download https with no proxy failed",
             )
 
+    @unittest.skipUnless(url_downloadable(
+        "https://ubuntu.com", logging.debug),
+        "Could not reach https test site")
+    def test_https_url_downloadable(self):
+        with EnvironmentVarGuard() as environ:
+            logging.debug("no proxy, https address")
+            del environ["http_proxy"]
+            install_opener(None)
+            self.assertTrue(url_downloadable("https://ubuntu.com",
+                            logging.debug),
+                            "download https with no proxy failed")
+
     def test_url_downloadable(self):
         from UpdateManager.Core.utils import url_downloadable
 
@@ -154,12 +166,18 @@ class TestMetaReleaseCore(unittest.TestCase):
             )
 
             logging.debug("no proxy, no valid address")
+<<<<<<< tests/test_meta_release_core.py
             self.assertFalse(
                 url_downloadable(
                     "http://archive.ubuntu.com/xxx", logging.debug
                 ),
                 "download with no proxy failed",
             )
+=======
+            self.assertFalse(url_downloadable("http://archive.ubuntu.com/xxx",
+                                              logging.debug),
+                             "download with no proxy failed")
+>>>>>>> tests/test_meta_release_core.py
 
             logging.debug("proxy, no valid address")
             environ["http_proxy"] = "http://localhost:%s" % self.port
@@ -186,7 +204,11 @@ class TestMetaReleaseCore(unittest.TestCase):
             supported for supported in di.supported() if di.is_lts(supported)
         ]
         with EnvironmentVarGuard() as environ:
+<<<<<<< tests/test_meta_release_core.py
             environ["META_RELEASE_FAKE_CODENAME"] = ltses[-2]
+=======
+            environ["META_RELEASE_FAKE_CODENAME"] = "bionic"
+>>>>>>> tests/test_meta_release_core.py
             meta = MetaReleaseCore(forceDownload=True)
             while meta.downloading:
                 time.sleep(0.1)
diff --git a/tests/test_pep8.py b/tests/test_pep8.py
new file mode 100644
index 0000000..5127dfe
--- /dev/null
+++ b/tests/test_pep8.py
@@ -0,0 +1,42 @@
+<<<<<<< tests/test_pep8.py
+=======
+#!/usr/bin/python3
+# -*- Mode: Python; indent-tabs-mode: nil; tab-width: 4; coding: utf-8 -*-
+
+import os
+import subprocess
+import unittest
+
+# pep8 is overdoing it a bit IMO
+IGNORE_PEP8 = "E265,E402,W503"
+IGNORE_FILES = (
+)
+
+
+class TestPep8Clean(unittest.TestCase):
+    """ ensure that the tree is pep8 clean """
+
+    def test_pep8_clean(self):
+        CURDIR = os.path.dirname(os.path.abspath(__file__))
+        py_files = set()
+        for dirpath, dirs, files in os.walk(os.path.join(CURDIR, "..")):
+            for f in files:
+                if os.path.splitext(f)[1] != ".py":
+                    continue
+                    # islink to avoid running pep8 on imported files
+                    # that are symlinks to other packages
+                if os.path.islink(os.path.join(dirpath, f)):
+                    continue
+                if f in IGNORE_FILES:
+                    continue
+                py_files.add(os.path.join(dirpath, f))
+        ret_code = subprocess.call(
+            ["pep8", "--ignore={0}".format(IGNORE_PEP8)] + list(py_files))
+        self.assertEqual(0, ret_code)
+
+
+if __name__ == "__main__":
+    import logging
+    logging.basicConfig(level=logging.DEBUG)
+    unittest.main()
+>>>>>>> tests/test_pep8.py
diff --git a/tests/test_proxy.py b/tests/test_proxy.py
index 266f173..1146fb4 100644
--- a/tests/test_proxy.py
+++ b/tests/test_proxy.py
@@ -31,16 +31,24 @@ class TestInitProxy(unittest.TestCase):
         apt_pkg.config.set("Acquire::http::proxy", self.proxy)
         apt_pkg.config.set("Acquire::https::proxy", self.https_proxy)
         from gi.repository import Gio
+<<<<<<< tests/test_proxy.py
 
         settings = Gio.Settings.new("com.ubuntu.update-manager")
         detected_proxy = init_proxy(settings)
         self.assertEqual(
             detected_proxy, {"http": self.proxy, "https": self.https_proxy}
         )
+=======
+        settings = Gio.Settings.new("com.ubuntu.update-manager")
+        detected_proxy = init_proxy(settings)
+        self.assertEqual(detected_proxy, {"http": self.proxy,
+                                          "https": self.https_proxy})
+>>>>>>> tests/test_proxy.py
 
     def testinitproxyHttpOnly(self):
         apt_pkg.config.set("Acquire::http::proxy", self.proxy)
         from gi.repository import Gio
+<<<<<<< tests/test_proxy.py
 
         settings = Gio.Settings.new("com.ubuntu.update-manager")
         detected_proxy = init_proxy(settings)
@@ -50,6 +58,29 @@ class TestInitProxy(unittest.TestCase):
 
     def testinitproxyHttpOnlyWithHttpsUri(self):
         apt_pkg.config.set("Acquire::http::proxy", self.https_proxy)
+=======
+        settings = Gio.Settings.new("com.ubuntu.update-manager")
+        detected_proxy = init_proxy(settings)
+        self.assertEqual(detected_proxy, {"http": self.proxy,
+                                          "https": self.proxy})
+
+    def testinitproxyHttpOnlyWithHttpsUri(self):
+        apt_pkg.config.set("Acquire::http::proxy", self.https_proxy)
+        from gi.repository import Gio
+        settings = Gio.Settings.new("com.ubuntu.update-manager")
+        detected_proxy = init_proxy(settings)
+        self.assertEqual(detected_proxy, {"http": self.https_proxy,
+                                          "https": self.https_proxy})
+
+    def testinitproxyHttpsOnly(self):
+        apt_pkg.config.set("Acquire::https::proxy", self.https_proxy)
+        from gi.repository import Gio
+        settings = Gio.Settings.new("com.ubuntu.update-manager")
+        detected_proxy = init_proxy(settings)
+        self.assertEqual(detected_proxy, {"https": self.https_proxy})
+
+    def testinitproxyNoProxy(self):
+>>>>>>> tests/test_proxy.py
         from gi.repository import Gio
 
         settings = Gio.Settings.new("com.ubuntu.update-manager")
diff --git a/tests/test_update_error.py b/tests/test_update_error.py
index c7b2eda..1daa99f 100644
--- a/tests/test_update_error.py
+++ b/tests/test_update_error.py
@@ -41,12 +41,20 @@ class TestUpdateManagerError(unittest.TestCase):
             self.manager, 1, error_occurred=True
         )
         self.assertIsInstance(p, UpdatesAvailable)
+<<<<<<< tests/test_update_error.py
         self.assertEqual(
             p.custom_desc, _("Some software couldn’t be checked for updates.")
         )
 
 
 if __name__ == "__main__":
+=======
+        self.assertEqual(p.custom_desc,
+                         _("Some software couldn’t be checked for updates."))
+
+
+if __name__ == '__main__':
+>>>>>>> tests/test_update_error.py
     if len(sys.argv) > 1 and sys.argv[1] == "-v":
         logging.basicConfig(level=logging.DEBUG)
     unittest.main()