add sort
resolve conflict in script.php