added dump.rdb
delete dump.rdb from gitignore
fixed merge conflicts
commit for merge