fixed merge bug with nav, and delete btn in cart