Merge of two puppet masters
Merge of two puppet masters