Hi Chazlegit,
If you haven't setup anything special in Photoshop CS6 (preferences etc.) a simple solution might be to simply uninstall and reinstall Photoshop CS6.
Uninstall it through the OS
Control Panel > Programs & Features (Windows 7/8)
Mac HD > Applications > Utilities > Adobe Installers (Mac OS X)
And then reinstall it through the Creative Cloud app in the Previous Version section
Creative Cloud Help | Install, update, or uninstall apps
Hope that helps,
- Dave