fix artifact of branch merging