Sex And The City Feud Appears Over As Kim Cattrall Reprises Role Of Samantha Jones For And Just Like That Cameo