Removed 3 conflict files that were accidentally included
Merge pull request #88 from BU-CS673/Canfield

Removed 3 conflict files that were accidentally included