number conflict fixed