Manually re-added your changes.

Looks like there were some problems with the previous merge.

I have manually added all of your changes since I last synced with your repo.