Fix merge conflicts
Update gemfile.lockl