Fixed syntax errors from file merge