Fixed Up Week and Day View Issues
fix Merge conflicts