removed weird leftover marker from last merge