Added dumpfile
Fixed dumpfile merge conflicts