fix create event, add item, merge conflict fixed, test resolved

fix create event, add item
merge conflict fixed
test resolved