setting week locally
moor
resolving conflict