create puppet modules
resolve merge conflict