Force commit a bunch of changes

* Conflict that I couldn't resolve.