diff --git a/www/howto/behave-well.spt b/www/howto/behave-well.spt
index 9c37088..0a3f6c7 100644
--- a/www/howto/behave-well.spt
+++ b/www/howto/behave-well.spt
@@ -62,9 +62,9 @@ differing views constructively. Practice
*why* someone is saying what they're saying, and look for common ground.
-## Handling Violations
+## Dealing With Bad Behavior
-When people do not behave well, we [handle conflict](./handle-conflict).
+When people do not behave well, we [deal with it](./deal-with-bad-behavior).
----
diff --git a/www/howto/deal-with-bad-behavior.spt b/www/howto/deal-with-bad-behavior.spt
new file mode 100644
index 0000000..76234f5
--- /dev/null
+++ b/www/howto/deal-with-bad-behavior.spt
@@ -0,0 +1,48 @@
+nav_title = 'Deal With Bad Behavior'
+[---]
+[---] text/html via markdown
+
+
+
+When people building Gittip do not [behave well](./behave-well), we deal with
+it swiftly and safely. Our primary goal is to ensure the safety of those who
+are wronged by the bad behavior of others. Our secondary goal is to facilitate
+behavior change and reconciliation where possible.
+
+
+## Level 0: Communicate Directly
+
+We try to empower people to deal with their own resentment and guilt, and
+direct communication of these negative feelings in public channels is a normal
+part of Gittip culture.
+
+If you are hurt by or frustrated at someone for whatever reason, you may tell
+them so by addressing them directly in front of others. Be direct but
+respectful. Focus on your feelings in response to specific behaviors. Avoid
+shouting, cussing, ridicule, etc.
+
+Conversely, if you wrong someone and realize it on your own, you may directly
+and publicly apologize, and ask what you can do to make it up to the person.
+
+
+## Level 1: See Something? Say Something!
+
+If you observe bad behavior, speak up.
+
+
+## Level 2: Involve Gittip's Conflict Team
+
+Our primary concern is your safety, and if *for any reason* you're not
+comfortable communicating directly with someone about their bad behavior, you
+should report the incident to [conflict@gittip.com](mailto:conflict@gittip.com)
+to involve Gittip's conflict team. We will handle the incident [swiftly and
+safely](https://adainitiative.org/2014/07/handling-harassment-incidents-swiftly-and-safely/).
+
+
+## Level 3: Involve Law Enforcement
+
+If you believe you or someone else is in physical danger in a Gittip space,
+please notify law enforcement. If you are unsure what law enforcement agency is
+appropriate, contact [conflict@gittip.com](mailto:conflict@gittip.com) or
+on-site event staff, and we will help you.
diff --git a/www/howto/handle-conflict.spt b/www/howto/handle-conflict.spt
deleted file mode 100644
index ff68421..0000000
--- a/www/howto/handle-conflict.spt
+++ /dev/null
@@ -1,4 +0,0 @@
-nav_title = 'Handle Conflict'
-[---]
-request.redirect('./resolve-conflict')
-[---] text/html via markdown
diff --git a/www/howto/index.spt b/www/howto/index.spt
index 72bb552..07b03aa 100644
--- a/www/howto/index.spt
+++ b/www/howto/index.spt
@@ -3,10 +3,6 @@ import os
nav_title = 'How To'
nav_children = [ name.rsplit('.', 1)[0] for name in os.listdir('howto')
if name not in ('.', '..', 'index.spt')]
-
-# remove redirect(s)
-nav_children.remove('handle-conflict')
-
nav_children.sort()
[---]
[---] text/html
diff --git a/www/howto/resolve-conflict.spt b/www/howto/resolve-conflict.spt
deleted file mode 100644
index 0497292..0000000
--- a/www/howto/resolve-conflict.spt
+++ /dev/null
@@ -1,191 +0,0 @@
-nav_title = 'Resolve Conflict'
-[---]
-[---] text/html via markdown
-
-
-
-When people building Gittip do not [behave well](./behave-well), it leads to
-conflict. In handling conflict, our goal is repentance and forgiveness, leading
-to reconciliation between the wrongdoer and the one wronged, resolution of
-their respective guilt and resentment, and an even deeper unity within our
-community than we enjoyed before.
-
-
-## Level 0: Communicate Directly
-
-**Your resentment is your responsibility.** If someone does something wrong to
-you personally, tell them so directly. Here's a short script you can use:
-
-
-
WRONGED
-
Hey, Wrongdoer! I'm frustrated at you because you stole my
- breakfast. Why am I frustrated at you?
-
-
WRONGDOER
-
You're frustrated at me because I stole your breakfast. Am I
- hearing you right?
-
-
WRONGED
-
Yes. Stealing each other's breakfast isn't something we do in
- the Gittip community, because that's not kind and we try to be kind to each
- other here. Does that make sense?
-
-
WRONGDOER
-
Yes. I'm sorry for stealing your breakfast. Do you forgive me?
-
-
WRONGED
-
Yes.
-
-
WRONGDOER
-
Thank you. What can I do to make it up to you?
-
-
WRONGED
-
Buy me lunch?
-
-
WRONGDOER
-
Deal!
-
-
WRONGED and WRONGDOER high-five and head to lunch.
-
-
-
-**Your guilt is your responsibility.** If you wrong someone and realize it on
-your own, apologize:
-
-
-
WRONGDOER
-
Hey Wronged, I stole your breakfast and that was wrong.
- I'm sorry for stealing your breakfast. Do you forgive me?
-
-
WRONGED
-
Thanks for apologizing! Yes, I forgive you.
-
-
WRONGDOER
-
Thank you. What can I do to make it up to you?
-
-
WRONGED
-
Buy me lunch?
-
-
WRONGED
-
Deal!
-
-
Wronged and Wrongdoer high-five and head to lunch.
-
-
-
-## Level 1: See Something? Say Something!
-
-**Community guidelines are everyone's responsibility**. If you observe
-harassment against someone, speak up:
-
-
-
WRONGDOER
-
Hey Wronged, you're dumb!
-
-
YOU
-
-
Whoa! Wrongdoer, it looks like you're harassing
- Wronged. That's not okay. We want to be kind to each other here. You should
- stop and apologize!
-
-
WRONGDOER
-
I'm sorry, but ...
-
-
YOU
-
No buts! If you're not ready to apologize right now,
- you should take a break for a bit and go offline.
-
-
Time passes. Perhaps YOU educate WRONGDOER, publicly or privately.
-
-
WRONGDOER
-
Hey Wronged, I was a jerk. Sorry for calling you
- dumb. Do you forgive me?
-
-
WRONGED
-
Yeah, I was frustrated when you called me dumb.
- Thanks for apologizing. I forgive you.
-
-
WRONGDOER
-
Thanks. What can I do to make it up to you?
-
-
WRONGED
-
Wanna help me with this thing?
-
-
WRONGDOER
-
Sure!
-
-
WRONGED and WRONGDOER high-five and work on the thing.
-
-
-
-And if you observe bad [behavior](./behave-well) that isn't directed at anyone
-in particular, speak up:
-
-
-
WRONGDOER
-
Hey everyone, check out my big dongle.
-
-
YOU
-
You just made a sexist joke, my friend! We don't do that around
- here, because it's not kind, especially to the women among us. We want to be kind! Make
- sense?
-
-
WRONGDOER
-
I'm sorry, but ...
-
-
YOU
-
No buts! If you're not ready to apologize right now, you should take
- a break for a bit and go offline.
-
-
Time passes. Perhaps YOU educate WRONGDOER, publicly or privately.
-
-
WRONGDOER
-
Hey you! You're right, I was a jerk. Sorry for making a sexist
- joke, everyone. Do you forgive me?
-
-
EVERYONE
-
Yes, we forgive you!
-
-
YOU
-
Thanks for apologizing! Now didn't you have a pull
- request waiting for review?
-
-
WRONGDOER
-
Yes!
-
-
YOU and WRONGDOER high-five and work on the pull request.
-
-
-
-## Level 2: Involve Gittip's Conflict Team
-
-Sometimes you won't be able to resolve a conflict by communicating directly
-with the person who wronged you, or you won't feel comfortable directly
-approaching the person who wronged you without someone else present. Sometimes
-no-one else from the community will step forward to help you. In that case,
-contact [conflict@gittip.com](mailto:conflict@gittip.com) to involve Gittip's
-conflict team.
-
-Gittip's conflict team will mediate a conversation between you and the person
-who wronged you. We are here to help and to ensure your safety, but ultimately
-you are still responsible for dealing with your own resentment by communicating
-directly with the person who wronged you. By working through the process of
-repentance and forgiveness together with the person who wronged you, you help
-them to become a better person, and you make the Gittip community as a whole
-stronger.
-
-If a person in the wrong is stubbornly unrepentant or a repeat offender,
-Gittip's conflict team will take action to exclude the wrongdoer from the
-community building Gittip, by removing their access to online channels and/or
-physical spaces. If in the future the person repents, they may be allowed back
-into the community. This will be on a limited basis at first while they earn
-back trust.
-
-
-## Level 3: Involve Law Enforcement
-
-If you believe you or someone else is in physical danger in a Gittip space,
-please notify law enforcement. If you are unsure what law enforcement agency is
-appropriate, contact [conflict@gittip.com](mailto:conflict@gittip.com) or
-on-site event staff, and we will help you.