Remove stray conflict markers.
Merge branch 'hotfix/2.2.1'