Fixed Gemfile merge conflicts