Merging Conflicts

[OmarioHassan]

I'm trying to Sync with upstream and found that there are a lot of conflicts are merged by @iliakan
How to fix this

[iliakan]

Git isn't always perfect when merging translations.

You can just compare English version with Arabic side by side.