regitstration feature added
Conflict removed