Fix error in Gemfile.lock from merge