git merge issue

join shbcf.ru