A post office in Charlottesville, Va., is the unlikely setting for a detente between President Trump and longtime critic Khizr Khan, reports the Daily Progress. Trump signed a bill on Friday renaming a branch the Captain Humayun Khan Post Office, after Khan's son, who was killed in the Iraq war in 2004. The branch is near the younger Khan's alma mater, the University of Virginia; Khan was the only alum killed in the war. The bill was sponsored by local Rep. Tom Garrett, who tweeted, "We can never repay the sacrifice of #CaptainKhan, but a grateful nation will continue to remember and honor you. Thank you to my colleagues & @realDonaldTrump for helping to get this over finish line!" Khizr Khan ripped into Trump at the 2016 Democratic National Convention, sparking a feud between the Republican nominee and the Gold Star family. (More Khizr Khan stories.)