Let's remove those extra files...

That is not how I should try to solve conflicts.