Favicon attempt
fix merge conflict