When conflict arises, it is best to always reach out to your supervisor immediately or to HR, thus you can avoid any miscommunication and have upper management deal with the situation. On a personal level, you should remain calm and do not provoke further conflict.