First, TechRepublic.com recommends taking a moment to analyze the situation. Sit down with a pen and paper, then jot down the conflict at hand as well as how you felt during the argument. Understanding the problem can help you take a big step toward coming up with a solution.
Next, sit down with your boss and go over your conflict together. This part will undoubtedly be a little uncomfortable at first, but taking the initiative can show your boss a sign of respect and positive intent. Go through your emotions and point of view on the situation, then listen to his or her feedback to come to a truce.
Finally, speak to your psychic if you're interested in finding out how your relationship with your boss will pan out in the future. A tarot reading can let you know if your career will be negatively affected by the disagreement or if you'll both leave it as water under the bridge.