update profile
fixed merge conflict