Adding unique validation on attribute name
Merging conflicts