fixed merge error in gemfile