This was the one git merge conflict I had. I'll look over it again.