If Merkel was hoping to "soften" Trump up by warning about the upcoming showdown between the US and the rest of the world, she made a mistake, because wires report that President Trump is said to be planning on adopting a confrontational tone at G7 in response to the other 6 nations collectively pressuring him regarding tariffs.
Source