lab 5 step 5 -- re edit the gemfile
lab 5 step 5 -- resolved conflict in Gemfile