fix
google tracking
routing
merge fix