Added cart merging during login