more revisions merging divergent applescripts