FIX syntax error after merge