fix merge conflict. Also, add google analytics tracking code