dealing conflict in intimacy