chinese/FreeWnn-server: resolve conflict
korean/FreeWnn-lib: resolve conflict
korean/FreeWnn-server: resolve conflict
japanese/FreeWnn-lib: resolve conflict
japanese/FreeWnn-server: resolve conflict