with fixing Conflicts for
	src/lib/dns/gen-rdatacode.py.in
	src/lib/dns/rdata.cc
	src/lib/dns/rrparamregistry-placeholder.cc
	src/lib/dns/tests/rdata_hinfo_unittest.cc
	src/lib/dns/tests/rdata_txt_like_unittest.cc