fix conflict
fix conflict by Chiu