added counties to yml
fixed merge errors