Progress on fixing the shadow-branch-merge
further branch merging