working on tags
fixed merge conflicts
Working on tags