Approach is always important than avoiding a situation, i will sit with the person amd explain how the tension is affecting our work, to agree putting aside our differences and work amicably. If it fails tale the matter to the manager or a senior person to intervene.