corrected syntax error after merge