Fix Google Analytics COde Conflict
Bug fix
Merge pull request #981 from tirgil/master

Fix Google Analytics Code Conflict
Merge pull request #982 from raj454raj/fix

Ticket Error fix