Conflicts:
	src/Makefile.am
	src/knot/conf/conf.c
	src/libknot/dnssec/key.c
	src/libknot/updates/changesets.c
	src/libknot/zone/zone-contents.c
	src/libknot/zone/zone-diff.c