Changed company -> foundation
Fixed a merge conflict