Remove extra block from merge
Bump cipher_version to 3.2.0