fix merge screw-up

Fixed the last screw-up of the merging