Fix merge mixup