fix conflicts in compilerProofScript.sml