MERGE CONTROLLERS, favorites is now working