add extended information about lifecycle events names
fix typo.
Conflict resolution.