We exchanged a few words, and the boss just made sure that we were working in different areas. After a few days, a hand shake, things worked out just fine.