Update db
Add edit profile page
resolved conflict