The conflict between them is over.

• 他们之间的冲突结束了。