index fix on createVersion
merge conflict