- merge the last server change to new server
- now working all in localhost