removed strange text caused by a merge I think