US-China trade war will finally be resolved