add tag feature
 merge