Sounds like a tricky one... I would say you've still worked on that game though, even if on a different branch... If I were you I would try to pick up a completely new project if possible :)
