Remove merge conflict artifact.
Remove merge conflict artifact.

STSILABS/open-fda,STSILABS/fda-sandbox,STSILABS/fda-sandbox,STSILABS/fda-sandbox,STSILABS/fda-sandbox,STSILABS/open-fda,STSILABS/open-fda,STSILABS/open-fda,STSILABS/open-fda,STSILABS/fda-sandbox