I don't know if there is any such thing as a situation that "makes conflict go away" in any kind of relationship, let alone relationships this complicate.
At any rate, my husband is impotent for psychological reasons rather then physical. While we don't have sex, the intimacy remains intense...