fixed incorrect merge for eos_vlan module