hopefully that fixed the favicon?
fixed the merge conflict and maybe also the favicon