This article describes a typical iterative development workflow, except the premature merge before all acceptance criteria were met. Give it another iteration.