Fix set-cookie header merging