encryption branch merge