Remove merge conflict

Looks like this little guy got missed somehow...figured I'd try to save you some time.