Merkel, Macron announce landmark EU deal