Added replicas
fixed merge conflict