add hidden view
merge code