Team says their code is done, tested, and working. They have merged all of their code and now to merge it with mine.

Take care of the merge, go to test it, and NONE OF IT WORKS.

Ok... So maybe something in my code did it. NOPE. Still crashes without mine.

Thank goodness for version control.

Now need to help define what "tested and working" means...