Changed analytics
Fixed merge error