Fixing a merge conflict from my last commit.