Forced Migration Merge Schtuff

It's making me commit changes and will not let me reset --hard.