Fixing divergence in branches