small usablity things, bug fix in the encrypted parity
fix conflict