Conflicts:
	src/knot/dnssec/nsec-chain.c
	src/knot/dnssec/nsec3-chain.c
	src/knot/nameserver/name-server.c
	src/knot/nameserver/nsec_proofs.c
	src/knot/updates/ddns.c
	src/knot/updates/xfr-in.c
	src/knot/zone/node.c
	src/knot/zone/zone-diff.c
	src/knot/zone/zone-dump.c
	src/knot/zone/zone-load.c
	src/knot/zone/zone-load.h