We share some of the tools and tactics that have helped us strengthen our partnership and resolve conflicts, even when the going gets tough.