Remove merge-generated typos
Further conditional reponse testing