some changes
fix conflict