resolving event conflict
merge