add hoi
fix conflict