fix account page error
mearge conflict