fix remaining merge error
fix syntax error
code style