diff -Nru u-boot-menu-4.0.3ubuntu1/debian/changelog u-boot-menu-4.0.3ubuntu2/debian/changelog
--- u-boot-menu-4.0.3ubuntu1/debian/changelog	2021-04-29 06:38:52.000000000 +0000
+++ u-boot-menu-4.0.3ubuntu2/debian/changelog	2021-05-07 10:10:18.000000000 +0000
@@ -1,3 +1,9 @@
+u-boot-menu (4.0.3ubuntu2) impish; urgency=medium
+
+  * Fix up merge conflicts in the previous upload.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Fri, 07 May 2021 11:10:18 +0100
+
 u-boot-menu (4.0.3ubuntu1) impish; urgency=low
 
   * Merge from Debian unstable. Remaining changes:
diff -Nru u-boot-menu-4.0.3ubuntu1/u-boot-update u-boot-menu-4.0.3ubuntu2/u-boot-update
--- u-boot-menu-4.0.3ubuntu1/u-boot-update	2021-04-21 15:15:39.000000000 +0000
+++ u-boot-menu-4.0.3ubuntu2/u-boot-update	2021-05-07 10:09:11.000000000 +0000
@@ -89,15 +89,9 @@
 U_BOOT_DEFAULT="${U_BOOT_DEFAULT:-l0}"
 U_BOOT_ENTRIES="${U_BOOT_ENTRIES:-all}"
 U_BOOT_TIMEOUT="${U_BOOT_TIMEOUT:-50}"
-<<<<<<< u-boot-menu-4.0.2ubuntu5 (ubuntu)
 U_BOOT_MENU_LABEL="${U_BOOT_MENU_LABEL:-${PRETTY_NAME:-Debian GNU/Linux kernel}}"
 U_BOOT_PARAMETERS="${U_BOOT_PARAMETERS:-ro earlycon}"
 U_BOOT_FDT_DIR="${U_BOOT_FDT_DIR:-/lib/firmware/}"
-=======
-U_BOOT_MENU_LABEL="${U_BOOT_MENU_LABEL:-${PRETTY_NAME:-Debian GNU/Linux kernel}}"
-U_BOOT_PARAMETERS="${U_BOOT_PARAMETERS:-ro quiet}"
-U_BOOT_FDT_DIR="${U_BOOT_FDT_DIR:-/usr/lib/linux-image-}"
->>>>>>> u-boot-menu-4.0.3 (debian)
 
 # Find parameter for root from fstab
 if [ -z "${U_BOOT_ROOT}" ]
diff -Nru u-boot-menu-4.0.3ubuntu1/u-boot-update.8 u-boot-menu-4.0.3ubuntu2/u-boot-update.8
--- u-boot-menu-4.0.3ubuntu1/u-boot-update.8	2021-04-21 15:15:39.000000000 +0000
+++ u-boot-menu-4.0.3ubuntu2/u-boot-update.8	2021-05-07 10:10:07.000000000 +0000
@@ -69,21 +69,17 @@
 default is 'all'.
 
 .IP "U_BOOT_MENU_LABEL=""\fBDebian GNU/Linux, kernel\fR""" 4
-<<<<<<< u-boot-menu-4.0.2ubuntu5 (ubuntu)
-This variable specifies the text that is used as a description in the boot menu. Value is an arbitrary string. If not specified, PRETTY_NAME from /etc/os\-release is used. Otherwise, it defaults to 'Debian GNU/Linux, kernel'.
-=======
 This variable specifies the text
 that is used as a description in the boot menu.
 Value is an arbitrary string.
 If not specified, PRETTY_NAME from /etc/os\-release is used.
 Otherwise, it defaults to 'Debian GNU/Linux, kernel'.
 
->>>>>>> u-boot-menu-4.0.3 (debian)
-.IP "U_BOOT_PARAMETERS=""\fBro quiet\fR""" 4
+.IP "U_BOOT_PARAMETERS=""\fBro earlycon\fR""" 4
 This variable specifies additional boot parameters
 that are appended to each kernel entry.
 Value is an arbitrary string,
-default is 'ro quiet'
+default is 'ro earlycon'
 (except for recovery entries, where quiet is avoided).
 
 .IP "U_BOOT_ROOT=""\fBroot\fR=\fIDEVICE\fR""" 4