profile page css still not working
merge conflct fixed
fixing conflicts