WIP: remove a piece of code copy by the merge op at the wrong place