A controversial immigration-themed Nativity scene at a north suburban church had a peaceful resolution on Christmas Eve when the Holy Family figures were reunited in safety — and federal agents included in the original display were turned into shepherds.