Remove conflict artifacts
Merge pull request #8 from Stanford-Online/stv/conflict

Remove conflict artifacts