fixed merge syntax error