resolving merge conflicts in visual studio code

welcome to shbcf.ru