add google analystic
fix conflict