fix ancient merge error
fix ancient merge error

dleehr/cwltool,common-workflow-language/cwltool,dleehr/cwltool,common-workflow-language/cwltool,dleehr/cwltool,common-workflow-language/cwltool,dleehr/cwltool