Fix taboo responder
Fix merge conflicts