CONFLICT (modify/delete): zh_TW/psi_zh_TW.ts deleted in HEAD and modified in master. Version master of zh_TW/psi_zh_TW.ts left in tree.
Auto-merging translations/psi_ur_PK.ts
CONFLICT (content): Merge conflict in translations/psi_ur_PK.ts
Auto-merging translations/psi_ca.ts
CONFLICT (content): Merge conflict in translations/psi_ca.ts
CONFLICT (modify/delete): cs/psi_cs.ts deleted in HEAD and modified in master. Version master of cs/psi_cs.ts left in tree.
Automatic merge failed; fix conflicts and then commit the result. (1)

CONFLICT (modify/delete): zh_TW/psi_zh_TW.ts deleted in HEAD and modified in master. Version master of zh_TW/psi_zh_TW.ts left in tree.
Auto-merging translations/psi_ur_PK.ts
CONFLICT (content): Merge conflict in translations/psi_ur_PK.ts
Auto-merging translations/psi_ca.ts
CONFLICT (content): Merge conflict in translations/psi_ca.ts
CONFLICT (modify/delete): cs/psi_cs.ts deleted in HEAD and modified in master. Version master of cs/psi_cs.ts left in tree.
Automatic merge failed; fix conflicts and then commit the result. (1)