fixed troubles in branches