Fixed merge conflicts
Fixed merge conflicts
Fix updater
Rebuild processTV.py
Minor fix processTV.py
Update .gitignore
Update .gitignore
Fixed merge conflicts