Despite warmth, Merkel and Trump still differ on trade and NATO