resolving merge conflicts in visual studio code

visit shbcf.ru