resolve merge conflict
add event_tracker gem
remove event tracker