Stocks erase weekly losses as China trade-war tensions simmer