Conflicts:
	Knot.files
	src/Makefile.am
	src/knot/conf/conf.c
	src/knot/ctl/estimator.c
	src/knot/ctl/knotc_main.c
	src/knot/ctl/remote.c
	src/knot/dnssec/nsec3-chain.c
	src/knot/dnssec/zone-keys.c
	src/knot/dnssec/zone-sign.c
	src/knot/nameserver/nsec_proofs.c
	src/knot/nameserver/process_query.c
	src/knot/nameserver/update.c
	src/knot/server/server.h
	src/knot/server/tcp-handler.c
	src/knot/server/udp-handler.c
	src/knot/updates/apply.c
	src/knot/zone/contents.c
	src/knot/zone/events/handlers.c
	src/knot/zone/timers.c
	src/knot/zone/zone-tree.c
	src/knot/zone/zonedb.c
	src/knot/zone/zonefile.c
	src/libknot/binary.c
	src/libknot/dname.c
	src/libknot/dnssec/key.c
	src/libknot/errcode.c
	src/libknot/internal/log.c
	src/libknot/internal/mempattern.c
	src/libknot/internal/net.c
	src/libknot/internal/tolower.c
	src/libknot/internal/trie/hat-trie.h
	src/libknot/internal/utils.c
	src/libknot/packet/compr.c
	src/libknot/packet/pkt.c
	src/libknot/processing/layer.c
	src/libknot/processing/requestor.c
	src/libknot/rrset-dump.c
	src/libknot/rrset.c
	src/libknot/rrtype/nsec3param.c
	src/libknot/rrtype/opt.c
	src/libknot/rrtype/tsig.c
	src/libknot/tsig-op.c
	src/utils/nsupdate/nsupdate_exec.c
	tests/hhash.c
	tests/namedb.c
	tests/zone_timers.c
	tests/zone_update.c