add popup
merge