Enforce applying expecting modes to newly merged conflict files
Enforce applying expecting modes to newly merged conflict files

Open343/pkg,skoef/pkg,khorben/pkg,en90/pkg,junovitch/pkg,junovitch/pkg,khorben/pkg,khorben/pkg,skoef/pkg,en90/pkg,Open343/pkg