Finish up events list
Fix conflicts