Donald Trump offers olive branch to China as tensions ease on final day of G7