WIP remove fish
solved remove issue in ajax
ajax remove
solved merge conflict
solved merge bug