First Mistake of the Project

Off to a great start…
Merge branch 'hotfix' into development