merge with multiview
(manual merge, git refused to octopus merge, whatever that is)