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

Fix Google Analytics Code Conflict