It sounds like YouTube is heading towards conflict with it’s long-term content providers as well. Their new algorithm heavily favors “shorts”. This really screws over the traditional medium to long format creators who arguably made YouTube successful. Sounds like they want to move quickly into the TikTok space but it’s sad for a lot of creators who are losing significant income d/t this change.

+1 for Sublime merge. I use it to resolve conflicts because I appreciate a gui for that and cli for everything else.