fix compile error
fix conflict