favorites building styling lost in merge conflict