fix friend
fix conflict