I'd recommend GitKraken here as well, I've been using it for years.
I will add something I avoid: SourceTree
While my recent use of SourceTree has been when I get a call from my colleagues to help them with their git, unless I'm missing something, it doesn't even have a conflict resolution tool built in? And everything just feels worse.
My Smart TV is now blocked from the wifi, I use a Fire TV stick in the back of it now, it was just far too slow.
Also I can bearly use the TV remote because it takes ages to wake up and reconnect to the TV.