json-response: Fix incorrect merge conflict resolution.