Conflicts: - `README.md`: Upstream modified its README, we have a completely different one. Kept our README file.
api/v1/admin/*
API::
Sidekiq::Testing.fake!
api/v1/trends
RSpec/InstanceVariable