change a tag to button
merge origin