conflict between common law and equity