fix syntax problem
fix conflict