Probably this is going to revert some changes I made in Windows on another PC. I really need to make sure I only dev from one environment at a time, or at least don't leave items uncommitted before switching...
Fixing conflicts maybe?