Fixed merge commit mixup