You resolve a turf war that began weeks ago. You still don’t like a certain colleague or neighbor, but at least you can co-exist peacefully.