fixed gemfile.lock merge conflict