Fix git merge error

- artifacts left in the component from a past merge conflict.  Comments welcome!