[develop] Remove left over conflict marker from merge 1a31f03