fix conflict
Merge branch 'replication' of https://github.com/EdgeComputing/cats into replication