added analytics
fixed merge