solve conflict file

build/usr/local/omc/etc/default/capconf.yaml

@@ -0,0 +1,22 @@
+# file: log file name
+# level: /trace/debug/info/error/warn/error/fatal, default: debug
+# duration: saved days, default is 30 days
+logger:
+  file: /usr/local/omc/log/captrace.log
+  level: warn
+  duration: 24
+  count: 10 
+
+gtp:
+  addr: :32152
+
+database:
+  type: mysql
+  user: root
+  password: 1000omc@kp!
+  host: 127.0.0.1
+  port: 33066
+  name: tenants_db
+  connParam: charset=utf8mb4&collation=utf8mb4_general_ci&parseTime=True&interpolateParams=True 
+
+

build/usr/local/omc/etc/default/omc.conf

@@ -0,0 +1,4 @@
+## Command Configuration
+VENDORS=CoreNet_EMS
+
+## Other