Still fixing...

The Main issue was that Chase and I ended up doing the same thing to the
same files in a different manner. I was checkstyling and he was checking
style, so we altered it differently.