Make sure puppet-mode is installed
Enable smerge mode for files with conflict markers