fixed syntax error from merge conflict.