Finished scrolling of DayView
solve merge conflict