favico + fix conflict