The EXTREMELY helpful guide to merge conflicts | Visual Studio Code | Podwise