fix middleman / master branch split