metomi/rose#316: remove merge conflict