removed conflicting code missed during merge