Ruih/merge kind tag

I made a mistake with my last merge. This needs to be a string instead of an enum.