adding store-backup
merge problem fix