what makes marriage work conflict resolution