nevermind
resolve merge conflict
puppet-mode. how quaint