For some time we've had a bit of unfinished business around the Drupal Code of Conduct around how we manage and respond to conflict.

The Community Working Group has drafted a policy and is now looking for community feedback over the next 2 weeks. Please check out the draft in the drupal-cwg issue queue.

https://drupal.org/node/2227717