Removed auto-created merge conflict files
Merge pull request #189 from BU-CS673/Canfield

Removed auto-created merge conflict files