Conflicted README.md induced
Merge 'origin/master' into 'master'