Fix conflict
Fix conflict

weekface/skydns,tonicbupt/skydns,hw-qiaolei/skydns,ZeaLoVe/skydns,vinhhrv/skydns,andrewrothstein/skydns,zhang0137/skydns,nicescale/skydns,netf/skydns,no2key/skydns,loveshell/skydns,yonglehou/skydns,skynetservices/skydns,AdoHe/skydns,tuannvm/skydns