Merge branch 'release/1.1.0'
Merge branch 'release/1.2.0'
Remove conflict markers from README

These probably snuck in during the last set of merges.