Removing binding pry
fixing merge conflict in Gemfile.loc