Conditional commits in translations-mergeback, fixed branch spec