Fix behavior in case of vector clock conflicts on replicas/acks
Rename vector clock conflict + add comment
Fix grammar mistake
Merge branch 'michel_1814_conflicts' into next