Fixing bad merge
Fixing bad merge

Two function declarations when there should be one.
dillia23/code-dot-org,rvarshney/code-dot-org,rvarshney/code-dot-org,pickettd/code-dot-org,rvarshney/code-dot-org,pickettd/code-dot-org,rvarshney/code-dot-org,dillia23/code-dot-org,rvarshney/code-dot-org,dillia23/code-dot-org,pickettd/code-dot-org,dillia23/code-dot-org,dillia23/code-dot-org,pickettd/code-dot-org,rvarshney/code-dot-org,dillia23/code-dot-org,dillia23/code-dot-org,pickettd/code-dot-org,rvarshney/code-dot-org,rvarshney/code-dot-org,dillia23/code-dot-org,pickettd/code-dot-org,pickettd/code-dot-org,pickettd/code-dot-org