japanese/jpilot: let's try this again
japanese/kon2-16dot: resolve conflict
Success: palm/jpilot v1.8.1_1
chinese/kon2: resolve conflict
Failure: chinese/kon2 v0.3_6