In the next lecture, we'll learn how to solve merge conflicts.

Please activate the code lense in your Visual Studio Code Settings before you continue, to be able to follow along as convenient as possible: