yet another merge issue solved