resolving conflicts

config.toml

@@ -223,7 +223,7 @@ no = 'Sorry to hear that. Please <a href="https://github.com/USERNAME/REPOSITORY
 	url = "https://discuss.kubernetes.io"
 	icon = "fa fa-envelope"
   desc = "Discussion and help from your fellow users"
-  
+
 [[params.links.user]]
 	name = "Twitter"
 	url = "https://twitter.com/kubernetesio"
@@ -260,7 +260,7 @@ no = 'Sorry to hear that. Please <a href="https://github.com/USERNAME/REPOSITORY
 	url = "https://git.k8s.io/community/contributors/guide"
 	icon = "fas fa-edit"
   desc = "Contribute to the Kubernetes website"
-  
+
 [[params.links.developer]]
 	name = "Stack Overflow"
 	url = "https://stackoverflow.com/questions/tagged/kubernetes"
@@ -301,7 +301,7 @@ language_alternatives = ["en"]
 
 [languages.ja]
 title = "Kubernetes"
-description = "Production-Grade Container Orchestration"
+description = "プロダクショングレードのコンテナ管理基盤"
 languageName = "日本語 Japanese"
 weight = 4
 contentDir = "content/ja"