Add google analytics
Fixed conflict