Fix additional merge issue