Rename vector clock conflict + add comment