to merge
git errors