added analytics back in
fixed merge