logo
Fixed merge conflict
Fixed comment