The situation has been patched up recently.

• 形势最近开始缓和了。