adding personalised settings for pauldambra
fix merge conflict in puppet file