japanese/lambdamoo: resolve conflict
japanese/lambdamoo: oops
Success: net/lambdamoo v1.8.1_1
chinese/mutt: resolve conflict
Success: mail/mutt v1.5.21_1