fixed GIT_BRANCH population after merge