resolved conflicts in branch quotas