README.md merge=ours
CONTRIBUTING.md merge=ours
