Fixing merge conflicts
Channel: Jonathan Geisler
Date: 18/09/2015

After we joined our repositories and updated to my first set of tests, we had some conflicts.  This walks through how to fix them and be ready to run the tests.