just a merge conflict
add dhcpcd.conf for ath6k compat wifi driver