7. Determine a signal for making up beforehand
For example, decide beforehand that, “We make up when our special song is playing,” and play this song when there is a fight. This might seem silly, but it is a good way for both sides to snap out of it.