Merkel, After Discordant G-7 Meeting, Is Looking Past Trump