japanese/acroread9: resolve conflict
chinese/FreeWnn-lib: resolve conflict