ver 6
merge conflict