update configs to remove conflicts