Update init.pp
fixing merge conflict