add test
dialog components
merge version