fixed merge conflict related syntax error