trying to fix the hashtags
trying to fix the merge conflicts