fix conflict
v0.7.8