add analytics
fixing conflict