Cleanup for puppet forge
Fix merge error