Fix tag editing / merging
Fix tag editing / merging

Signed-off-by: Ari Maniatis <7158a9e0f8e84a0a74ed148e0f652dfbd4913a18@ish.com.au>
rafaspinola/jobsworth,rafaspinola/jobsworth,digitalnatives/jobsworth,ari/jobsworth,evinoca/clockingit,rafaspinola/jobsworth,arunagw/clockingit,digitalnatives/jobsworth,digitalnatives/jobsworth,ari/jobsworth,ari/jobsworth,xuewenfei/jobsworth,rafaspinola/jobsworth,webstream-io/jobsworth,xuewenfei/jobsworth,webstream-io/jobsworth,webstream-io/jobsworth,digitalnatives/jobsworth,ari/jobsworth,arunagw/clockingit,arunagw/clockingit,digitalnatives/jobsworth,evinoca/clockingit,evinoca/clockingit,webstream-io/jobsworth,xuewenfei/jobsworth,evinoca/clockingit,xuewenfei/jobsworth