I would try to resolve conflict internally and with respect for each other, and if that did not work I would consider bringing this situation to a higher up to help resolve the issue before it gets worse.