fix date inputs for events
fix conflicts