committing to save my changes. I sent notifications like a badass
Fixed merge conflict, but now index doesn't work. Paige can you fix?