sytax fixes
conflict fixed
fix syntax error