resolving conflicts with spouse