Fix merge issue

Author: miatttao

src/sonic-yang-models/tests/files/sample_config_db.json

@@ -2339,10 +2339,7 @@
         },
         "VNET_ROUTE_TUNNEL" : {
             "vnet1|10.0.0.0/24" : {
-<<<<<<< HEAD
                 "name":"vnet1|10.0.0.0/24",
-=======
->>>>>>> c1960504e (Fix for sample data)
                 "endpoint": "192.168.1.2",
                 "mac_address": "F9:22:83:99:22:A2",
                 "vxlanid": "10011"