Added editing to encrypted
merged db