Sprint 1 merge