weird merge issue