Manually re-added your changes.

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