awesomejapan: fix broken merge
awesomejapan: fix broken merge

Former-commit-id: c17b5bc7c917846f353658dbfe09a4d887ba72c3 [formerly 19aa9008435513b5f4f7dec87ac50528e4397579]
Former-commit-id: f763f979cddb55f45ecfb3494875fc27193bc7d7
torhve/ivar2,torhve/ivar2,haste/ivar2,torhve/ivar2