commit for merge, jg var removal
git merge errors