Hmmmmm, now this is sounding more like a problem, a rather big problem. If it were me, I would see if I could make a move within the company. I would probably avoid him as much as possible, but I would be extremely polite and nice to him. You cannot have any more fights with him or I fear you BOTH may lose your jobs. I might even secretly being looking for a "better" position to get you out of there and away from him. Office politics really do suck!