fixed a merge issue