Conflicts solving
Merge branch 'master' of https://github.com/rickyyy/sdm_encrypted_data.git
Search in enc data for case 1 working