FIX left over conflict marker from previous backport