Yet another merge issue fix