[Metin2 - 11] Resolved Conflicts