Rebuilt. Deleted leftover files from merging.