China & USA IP Conflict

In the last several months there has been increasing tension between China and the United States regarding intellectual property theft. Donald Trump has made numerous accusations that China has repeatedly infringed on USA intellectual property in various industries, including technology, aerospace, cyber security, etc. Trump has also made multiple accusations that China deliberately conspired to manufacture the COVID-19 pandemic to allow China to become dominant over the USA as the #1 world superpower. Do you think that the USA and China will come to a diplomatic resolution and end the IP dispute within a timely manner, or will this problem continue to escalate?