publish: DiffMerge the final script differences.

generated from commit 2ec083145ef1c70df180ef6953f8cea8e803ecdc