update by troy
fix the conflict file