Opscode Repo Merge