Remove hang-over conflict markers
Merge branch 'live' into suppress-reset-font-size