merge conflicts in git

welcome to shbcf.ru