another merge issue