resolve scri[r error on dispatch allocation
Merge branch 'master' of https://github.com/EdgeComputing/cats
Merge branch 'master' of https://github.com/EdgeComputing/cats
resolve conflict