merge conflict resolved
fixed bug with alert box displaying unknown variable substitution