User page changed
fix merge conflicts