Init a blank chef-solo repository by knife solo init
Merge remote-tracking branch 'origin/master'