remove merging error from init.pp