tested resolveAction, fixed delete bug