add profile manage
fix merge conflict