Added case to substitution where bound variable conflicts with free variable in term to be substituted