Edited Analytics Code
Resolved conflict updated analytcis code