add upload popup
merge