fix syntax error
fix merge conflicts