Add tagging
Fixes merge conflict