fix conflict
Reload and some other bug fixes