version text auto
merge conflict