diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0d38fc8..398214c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,7 +9,7 @@
 - Protect against lengthy app names which gives Docker trouble later on ([#83](https://git.autonomic.zone/coop-cloud/abra/issues/83))
 - Support removal of secrets and volumes when `rm`'ing apps ([#44](https://git.autonomic.zone/coop-cloud/abra/issues/44))
 - Always choose the default IPv4 address with `abra server <host> init` ([#91](https://git.autonomic.zone/coop-cloud/abra/issues/91))
-- Add `--type=<type>` filtering option to `abra <app> ls` ([1fa2de4](https://git.autonomic.zone/coop-cloud/abra/commit/1fa2de4))
+- Add `--type=<type>` filtering option to `abra <app> ls` ([0828189](https://git.autonomic.zone/coop-cloud/abra/commit/0828189))
 
 # abra 0.5.0 (2021-03-01)
 
diff --git a/abra b/abra
index 5a9e641..6cea232 100755
--- a/abra
+++ b/abra
@@ -1739,11 +1739,7 @@ abra() {
     abra___secrets abra___status abra___no_tty abra___app_name \
     abra__subcommands_ abra___skip_update abra___skip_check \
     abra__backup_file_ abra___verbose abra___debug abra___help \
-<<<<<<< HEAD
-    abra___update abra___branch abra___volumes abra__provider_
-=======
-    abra___update abra___branch abra___volumes abra___type
->>>>>>> 1fa2de4... Add --type filter to `abra <app> ls`
+    abra___update abra___branch abra___volumes abra__provider_ abra___type
 
   if ! type tput > /dev/null 2>&1; then
     tput() {