fix conflict
add seo info
Merge branch 'feature/analitics' into staging