Did you follow Raze's instructions dot by dot = specially retrieving your original files again? (Fake branch)- not doing this causes grave quest problems afterwards. The file in charge for stories seems corrupted.

And which quests were unsolved?

Have you got a save BEFORE you did the fake branch swap?
Kiya