Merging conflicts.
Getting SPDY to work