Use kdiff3 as mergetool
Prevent merge artifacts