fixed git branch mess