added mixpanel
fixed merge conflict