finalized merges (added some favorites back in)