prevent autoresolution of merge conflicts for kdiff3