openssl: fix further merge spam