This is a clean commit history with hotfix dev conflicts handled

Due to the nature of development we introduced conflicts by moving forward updating features. QA has been fixed, and in dev we are left to handle the conflicts. This is more ideal because you have more time to respond while still in dev.