bug profile
fix conflict