Repair broken merge commit