great validation
syncing and confict fix