fix transfer 0bytes crash bug
fix conflict and merge