Fixed another merge issue