I am regularly updating baobab using jhbuild and it fails to build every time if there is updated translations. Error:

*** Checking out baobab *** [125/202]
git remote set-url origin ssh://muktupavels@git.gnome.org/git/baobab
git remote update origin
Fetching origin
remote: Counting objects: 17, done.
remote: Compressing objects: 100% (12/12), done.
remote: Total 12 (delta 9), reused 0 (delta 0)
Unpacking objects: 100% (12/12), done.
From ssh://git.gnome.org/git/baobab
   72a7886..f7c2cc8  master     -> origin/master
git stash save jhbuild-stash
Saved working directory and index state On master: jhbuild-stash
HEAD is now at 72a7886 Updated Danish translation
git rebase origin/master
First, rewinding head to replay your work on top of it...
Fast-forwarded master to origin/master.
git stash pop
Auto-merging po/nb.po
CONFLICT (content): Merge conflict in po/nb.po
Auto-merging po/fr.po
CONFLICT (content): Merge conflict in po/fr.po
Auto-merging po/de.po
CONFLICT (content): Merge conflict in po/de.po
*** Error during phase checkout of baobab: ########## Error running git stash pop *** [125/202]

I think that problem is that PO_DEPENDS_ON_POT and DIST_DEPENDS_ON_UPDATE_PO is set to yes in po/Makevars. Every module I have checked use no for both - recipes, nautilus, gnome-shell, mutter, jhbuild, dconf, epiphany...