metomi/rose#351: remove merge conflict