Merge Netflix changes