commit after manually merging interactive event functionality