resolve a git conflict

niruvt · niruvt · commit 95116d1e88fd · 2021-07-16T19:25:12.000+05:30
diff --git a/_data/translations.yml b/_data/translations.yml
@@ -113,10 +113,7 @@ navigational-elements_mission:
   vi: "Sứ mệnh"
   zh: "Missing"
   mr: "उद्दिष्ट"
-<<<<<<< HEAD
-=======
   ca: "Missió"
->>>>>>> 972728a95ed0b3eee8016c4f62b97ed1467452db
 navigational-elements_help:
   de: "Hilfe"
   en: "Help"
