Fixed merge error at package.rb