Committing lots of changes, building now succeeds
Committing part e