Fixed save favorites and merge conflicts