merged negotiation-dsl into comm;