Switch from merge-resolve(default) to merge mode for containerd-build-arm64
Switch from merge-resolve(default) to merge mode for containerd-build-arm64

Signed-off-by: Davanum Srinivas <36003aec7ba325a16727bc9a176c12d2776a8ce4@gmail.com>

thaJeztah/containerd,dmcgowan/containerd,mikebrow/containerd,containerd/containerd,containerd/containerd,vdemeester/containerd,estesp/containerd,vdemeester/containerd,mikebrow/containerd,dmcgowan/containerd,thaJeztah/containerd,estesp/containerd