fixed margin left on profilepage
fix merge errors