update render() to preserve the original response object
resolve conflicts, reword change entry a bit