Adding favorite function
Merging