Conflicts: - `README.md`: Upstream added some text, but our README is completely different. Kept our README unchanged.