add dump
fix conflict