added wiki gem
fixed gemfile merge conflict