which is basically what used to happen (when

:merge

was default behaviour)