fix gemfile.lock merge conflict