Finished Profile.html
fixing merge conflicts
merge confilcts