fixed git conflit error in Gemfile