Some fix
Fix conflics
Merge branch 'adding-ajax'
Delet fuse
Fix