Removed clashing files.

This removes the 2 clashing files in #107.

Now I can finally checkout branches :smile: