more ordering in app/scripts/sql
added local.php
resolved merge conflict