Fix unspotted merge conflict