week view overlap.
fixed merge issues
fixed
fixed merge