merge conflict and event creation
bug with undefined is_template