Being able to management conflict is an important skill for job and relationships. Being able to take time to have a conversation and sort things out will be better in the long run. Part of conflict management is recognizing that sometimes our intent is not the impact on the person. This can go both ways which is why it is important to have a conversation and have someone else there if needed.

• Conflict Resolution – 8 Ways to Resolve Conflict in the Workplace (mindtools.com)
• Four tips for managing conflict 
• What Conflict Animal Are You? | Interact Quiz (tryinteract.com) This is a fun quiz to understanding different types of conflict styles. It is good to understand them for yourself as well as working with others. For instance, if you are a “Shark” more direct and up-front vs a “Turtle” those who try to avoid conflict at all it may be harder to actually solve the conflict as Turtles could try to just end the conflict without actually getting to the root of the problem to get it over faster. It is important that we understand who we are as we may need to change our approach depending on who we are working with.