Pre-merge
merge
Make profile view function