Fix merge confict with libzlib