changes in site logo
Fix merge errors
Merge fix