working on registration view
resolved conflicts