encrypt decrypt works
merge conflict solved