Further edits to clean up a conflict in 2_1_Installation.tsr