yet another git branch fix