Removed a few git conflict files that were comitted.

Fixes #78