Fixed attribute name conflict in merge cross case