Spelling: built -> build
Cleaning up merge conflicts.