added korean locale
conflict resolved
added korean locale