Changes should now be in sync with dominik