web.http: Removed conflict markers left over in merge
web.http: Removed conflict markers left over in merge

treemo/circuits,treemo/circuits,eriol/circuits,treemo/circuits,eriol/circuits,eriol/circuits,nizox/circuits