24-tech-session
Fixed Merge conflicts.