basic tags working
fixing merge conflicts