fix syntax error
fix merge conflict