addng optional re-encrypt poassword
fixed package merge conflict