fixed syntax
syntax errors
fix merge conflict