We will all encounter conflict with our boyfriend, girlfriend, husband, or wife at many, many points of our relationship. Resolve your issues and focus on making up after a fight.