If you have to fight, hold hands and go for a walk. It's very, very, VERY difficult to get angry while holding hands, or while walking together in the same direction.

The latter advice is great for all relationships, not just romantic ones. Conversations that happen on walks are very different from conversations that happen when you sit facing each other. Try it.