fix minor issue
fix conflict
update readme
add one future work
fix
fix
fix