dealing with conflict in intimacy