merge the new brancher fixes #1

Better flippin fix it