NFC id formatted properly
Resolving conflicts