user profile bug fixed
fixed merge