remove dump
fixed merge conflicts