Fixed syntax error from merge