Sprint 3 successful merge