Added DiffMerge; ensure script runs in it's own directory