global conflict update

You may have missed