synchronize changes from fog master