Merge branch 'jc/maint-add-u-remove-conflicted'