The image above shows the feature branch, and the bad merge commit from development branch. Basically one of the devs kept old code instead of accepting incoming changes.