Fixed merge conflicts
Events now show tags
made changes in Tag.java