skydns: remove merge markers

ehh, yeah