fix merge bug in set_profile
fix merge bug in set_profile

cloudcopy/seahub,miurahr/seahub,Chilledheart/seahub,cloudcopy/seahub,madflow/seahub,madflow/seahub,madflow/seahub,cloudcopy/seahub,cloudcopy/seahub,madflow/seahub,miurahr/seahub,Chilledheart/seahub,Chilledheart/seahub,miurahr/seahub,madflow/seahub,miurahr/seahub,Chilledheart/seahub,Chilledheart/seahub