removed syntax error caused by conflict