A dispute hangs over everyone’s head, but don’t let it dampen holiday spirits. Showing you’ve no hard feelings gets others to soften theirs.