Fix tagging after branch merge.