name conflict check added
name conflict check added