japanese/eterm: resolve conflict
Failure: x11/eterm v0.9.6_1
mail/exmh2: resolve conflict