Prioritize LSM
Support multi-day events (like LSM) and refactor visual hierarchy
Resolve merge conflict