Conflicts:
	src/knot/dnssec/zone-sign.c
	src/knot/nameserver/axfr.c
	src/knot/nameserver/internet.c
	src/knot/nameserver/notify.c
	src/knot/nameserver/nsec_proofs.c
	src/knot/server/xfr-handler.c
	src/knot/server/zone-load.c
	src/knot/server/zones.c
	src/knot/updates/ddns.c
	src/knot/updates/xfr-in.c
	src/knot/zone/contents.c
	src/knot/zone/contents.h
	src/knot/zone/semantic-check.c
	src/knot/zone/semantic-check.h
	src/knot/zone/zone-diff.c
	src/knot/zone/zonefile.c
	tests/process_query.c