added analytics
Merge conflict fixed