Events show up on correct days :D
Fixed merge