Profile data editing, carousel on homepage
Conflict fix