diff --git a/script/merge.php b/script/merge.php old mode 100644 new mode 100755