Resolving Merge Conflicts with Visual Studio Code

I recently launched my Discord server to talk about Open Source and Web Development, feel free to join: https://discord.gg/bqwyEa6We6 Merge conflicts can be scary, but if you know how to use your tools, there's no need to worry! (Unless you're mergi...