Conflicts: - `README.md`: Upstream modified its README, we have a completely different one. Kept our README file.
api/v2/suggestions
api/web/push_subscriptions
RSpec/StubbedMock
API::