Remove conflict artifacts

@jrbl 

The following check against the repo (post-commit) returns no results.
```
grep -rI '<<<<<<<' .
grep -rI '>>>>>>>' .
```