updating so that this works with v2 configs
fixing conflict