change cart empty => cart 0 in header
align navbar links after signing in
fix merge conflicts