Recover changes lost in the merge
Further post-merge fiddling