commit before pull
updated
test
before merging with EDU
finished merging with EDU
fix trigger syntax error