merge simple conv
merge simple conv


Former-commit-id: 6b29d544669e9ad7c746a1a658773c702496eaa8
Former-commit-id: 88d086e9ba81748905d4f4473f42df4a24457544
dssg/wikienergy,dssg/wikienergy,dssg/wikienergy,dssg/wikienergy,dssg/wikienergy