git rebase conflict resolution

welcome to shbcf.ru