Our top tips to resolve conflict and keep the love alive.