I have merged 2 branches and now keep getting `Err...

# announcements

[aaverin]

I have merged 2 branches and now keep getting Error:cannot access NonExistentClass.
Is there anything I can do to figure out what's wrong?