can't merge with dffferent branches after upgrading to 3.01