add anlytics tracking
fix merge conflict