Fix issue with changing TechChoices wiping unsaved work, merge TechChoices when Creating/Updating TechStacks and remove unnecessary TechChoi