updated gemfile
fixing another merge error