Resolved Merge Conflicts with PR #2669

Author: MuhammadUmarAsad

config/vlan.py

@@ -76,10 +76,10 @@ def add_vlan(db, vid, multiple):
                 config_db.set_entry('VLAN', vlan, {'vlanid': str(vid)})
                 click.echo("Vlan{} has been added".format(vid))
 
-				# set dhcpv6_relay table
-				set_dhcp_relay_table('DHCP_RELAY', config_db, vlan, {'vlanid': str(vid)})
-				# We need to restart dhcp_relay service after dhcpv6_relay config change
-				dhcp_relay_util.handle_restart_dhcp_relay_service()
+                # set dhcpv6_relay table
+                set_dhcp_relay_table('DHCP_RELAY', config_db, vlan, {'vlanid': str(vid)})
+                # We need to restart dhcp_relay service after dhcpv6_relay config change
+                dhcp_relay_util.handle_restart_dhcp_relay_service()
 
             except ValueError:
                 ctx.fail("Invalid VLAN ID {} (2-4094)".format(vid))
@@ -138,12 +138,12 @@ def del_vlan(db, vid, multiple):
 
 				# set dhcpv4_relay / VLAN table
                 config_db.set_entry('VLAN', 'Vlan{}'.format(vid), None)
-                click.echo("Vlan{} has deleted added".format(vid))
+                click.echo("Vlan{} has been deleted".format(vid))
 
-				# set dhcpv6_relay table
-				set_dhcp_relay_table('DHCP_RELAY', config_db, vlan, None)
-				# We need to restart dhcp_relay service after dhcpv6_relay config change
-				dhcp_relay_util.handle_restart_dhcp_relay_service()
+                # set dhcpv6_relay table
+                set_dhcp_relay_table('DHCP_RELAY', config_db, vlan, None)
+                # We need to restart dhcp_relay service after dhcpv6_relay config change
+                dhcp_relay_util.handle_restart_dhcp_relay_service()
 
             except JsonPatchConflict:
                 ctx.fail("{} does not exist".format(vlan))