clarify what versions of libzmq are supported
fix merge conflicts