update gui
merge