lib/scripts.php: fixed merge conflict