Actually removed those damn superfluous files.
Resolve merge conflict.