fixed syntax error from merge