ver 12
merge conflict 12