update fav
confict fix